diff --git a/input/_layout.cshtml b/input/_layout.cshtml
index 9e86839..62077e2 100644
--- a/input/_layout.cshtml
+++ b/input/_layout.cshtml
@@ -84,10 +84,6 @@
         {
           @Html.Partial("_post-after-content")
         }
-        else if (isPage)
-        {
-          @Html.Partial("_page-after-content")
-        }
         @Html.Partial("_common-after-content")
       </div>
     </div>
diff --git a/input/_navbar.cshtml b/input/_navbar.cshtml
index 01790ac..efbef33 100644
--- a/input/_navbar.cshtml
+++ b/input/_navbar.cshtml
@@ -1,4 +1,4 @@
-@foreach(IDocument doc in Context.OutputPages.Where(x => x.GetBool("ShowInNavbar", x.GetBool("IsPage"))).OrderBy(x => x.GetInt(Keys.Order)))
+@foreach(IDocument doc in Context.OutputPages.Where(x => x.GetBool("ShowInNavbar", false)).OrderBy(x => x.GetInt(Keys.Order)))
 {
   // Pages get added to the navigation bar by default,
   // other pages (including posts) only if they have ShowInNavbar set to true