diff --git a/layouts/partials/latest-posts.html b/layouts/partials/latest-posts.html
index 4ed1374..5875751 100644
--- a/layouts/partials/latest-posts.html
+++ b/layouts/partials/latest-posts.html
@@ -1,8 +1,8 @@
 <ul id="post-list" class="archive readmore">
     <h3>{{ with .Site.Params.readMore }}{{ . }}{{ else }}Read more{{ end }}</h3>
     {{ range first 10 .Site.Pages }}
-    {{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
-        {{ if and (ne $url "about/") (ne $.Title .Title) }}
+    {{ $url := replace .Permalink .Site.BaseURL "" }}
+        {{ if and (ne $url "about/") }}
         <li>
             <a href="{{ .Permalink }}">{{ .Title }}<aside class="dates">{{ .Date.Format "Jan 2" }}</aside></a>
         </li>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 8c9b8f3..1716e92 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -1,6 +1,6 @@
 <nav class="main-nav">
-	{{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
-	{{ if ne $url "" }}
+	{{ $url := replace .Permalink .Site.BaseURL "" }}
+	{{ if not .IsHome }}
 		<a href='{{ .Site.BaseURL }}'> <span class="arrow">←</span>{{ with .Site.Params.home }}{{ . }}{{ else }}Home{{ end }}</a>
 	{{ end }}
 
diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html
index 9501ae8..3318698 100644
--- a/layouts/partials/post-list.html
+++ b/layouts/partials/post-list.html
@@ -1,6 +1,6 @@
 <ul id="post-list">
     {{ range .Paginator.Pages }}
-    {{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
+    {{ $url := replace .Permalink .Site.BaseURL "" }}
         {{ if ne $url "about/" }}
             <li>
                 <a href='{{ .Permalink }}'><aside class="dates">{{ .Date.Format "Jan 2" }}</aside></a>