diff --git a/layouts/_default/list.html b/layouts/_default/section.html
similarity index 88%
rename from layouts/_default/list.html
rename to layouts/_default/section.html
index 48dbd99..54b2c0b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/section.html
@@ -10,6 +10,7 @@
                     {{ end }}
                 {{ end }}
             </div>
+            {{ if ne (len (where .Data.Pages "Title" "!=" $globalTitle)) 0}}
             <div class="page-heading">{{ .Title }}</div>
             <ul>
                 {{ range .Data.Pages.ByPublishDate }}
@@ -18,6 +19,7 @@
                     {{ end }}
                 {{ end }}
             </ul>
+            {{ end }}
         </div>
     </div>
 </section>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e659861..761647d 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,10 +5,10 @@
 
 <body lang="{{ .Site.Params.lang }}">
 
-{{ if .IsHome }}
-<section class="header header-home"> 
-{{ else }}
+{{ if .IsPage }}
 <section class="header"> 
+{{ else }}
+<section class="header header-home"> 
 {{ end }}
     <div class="container">
         <a href="{{ .Site.BaseURL }}"><img class="logo" src="{{ .Site.Params.logofile | absURL }}" /></a>
@@ -16,9 +16,16 @@
             <a href="{{ .Site.BaseURL }}"><div class="name"><h1>{{ .Site.Title }}</h1></div></a>
             <nav>
                 <ul>
-                    <a href="{{ .Site.BaseURL }}"><li>Blog</li></a>
-                    <a href="{{ .Site.BaseURL }}about/"><li>About</li></a>
-                    <a href="{{ .Site.BaseURL }}projects/"><li>Projects</li></a>
+                    {{ range .Site.Sections }}
+                        {{ range first 1 .Pages }}
+                            <a href="{{ .Section | urlize }}"><li>{{ .Section }}</li></a>
+                        {{ end }}
+                    {{ end }}
+                    {{ range where .Site.Pages "Section" ""}}
+                        {{ if ne .Title "Home"}}
+                            <a href="{{ .Permalink }}"><li>{{ .Title }}</li></a>
+                        {{ end }}
+                    {{ end }}
                 </ul>
             </nav>
         </div>
