diff --git a/src/Umbraco.SampleSite.Website/Views/Master.cshtml b/src/Umbraco.SampleSite.Website/Views/Master.cshtml
index f9e875a9..fae5e059 100644
--- a/src/Umbraco.SampleSite.Website/Views/Master.cshtml
+++ b/src/Umbraco.SampleSite.Website/Views/Master.cshtml
@@ -1,11 +1,9 @@
-@using ContentModels = Umbraco.Web.PublishedContentModels;
-@using Umbraco.Core
-@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
+@inherits UmbracoTemplatePage
 @{
     Layout = null;
 
     // Get basic design settings from the homepage
-    ContentModels.Home home = Model.Content.Site() as ContentModels.Home;
+    var home = (Home)Model.Content.Site();
     var colorTheme = Umbraco.GetPreValueAsString(home.ColorTheme);
     var font = Umbraco.GetPreValueAsString(home.Font);
 }
diff --git a/src/Umbraco.SampleSite.Website/Views/Partials/Navigation/TopNavigation.cshtml b/src/Umbraco.SampleSite.Website/Views/Partials/Navigation/TopNavigation.cshtml
index 593be54e..a45d3c62 100644
--- a/src/Umbraco.SampleSite.Website/Views/Partials/Navigation/TopNavigation.cshtml
+++ b/src/Umbraco.SampleSite.Website/Views/Partials/Navigation/TopNavigation.cshtml
@@ -5,7 +5,7 @@
     var selection = site.Children.Where(x => x.IsVisible());
 }
 <!-- uncomment this line if you don't want it to appear in the top navigation -->
-<a class="nav-link @Html.Raw(@Model.Content.Id == site.Id ? "navi-link--active" : "")" href="/">@CurrentPage.Site().Name</a>
+<a class="nav-link @Html.Raw(Model.Content.Id == site.Id ? "navi-link--active" : "")" href="@site.Url">@site.Name</a>
 @foreach (var item in selection)
 {
     <a class="nav-link @(item.IsAncestorOrSelf(Model.Content) ? "nav-link--active" : null)" href="@item.Url">@item.Name</a>