diff --git a/initer/templates.go b/initer/templates.go
index 49d5915..46b524d 100644
--- a/initer/templates.go
+++ b/initer/templates.go
@@ -59,11 +59,9 @@ var defaultTemplate string = `<!DOCTYPE html>
 
 {{range $index, $post := .PostCollection}}
 <div class="blogpost">
-  <a href ="{{$post.Link}}" class="linktopost">
     <h1>
-      {{$post.Title}}
+        <a href ="{{$post.Link}}" class="linktopost">{{$post.Title}}</a>
     </h1>
-  </a>
   {{$post.Content}}
 </div>
 {{end}}
@@ -117,10 +115,10 @@ var defaultTemplate string = `<!DOCTYPE html>
 {{if or .Previous .Later}}
 <div class="blognavigation">
   {{if .Previous}}
-  <a href="{{.Previous}}"><h2>&lt;--Previous</h2></a>
+  <h2><a href="{{.Previous}}">&lt;--Previous</a></h2>
   {{end}}
   {{if .Later}}
-  <a href="{{.Later}}"><h2>Later--&gt;</h2></a>
+  <h2><a href="{{.Later}}"><h2>Later--&gt;</a></h2>
   {{end}}
 </div>
 {{end}}
@@ -187,11 +185,9 @@ var bsStarterTemplate string = `
 
 {{range $index, $post := .PostCollection}}
 <div class="blogpost">
-  <a href ="{{$post.Link}}" class="linktopost">
     <h1>
-      {{$post.Title}}
+      <a href ="{{$post.Link}}" class="linktopost">{{$post.Title}}</a>
     </h1>
-  </a>
   {{$post.Content}}
 </div>
 {{end}}
@@ -241,10 +237,10 @@ var bsStarterTemplate string = `
 {{if or .Previous .Later}}
 <div class="blognavigation">
   {{if .Previous}}
-  <a href="{{.Previous}}"><h2>&lt;--Previous</h2></a>
+  <h2><a href="{{.Previous}}">&lt;--Previous</a></h2>
   {{end}}
   {{if .Later}}
-  <a href="{{.Later}}"><h2>Later--&gt;</h2></a>
+  <h2><a href="{{.Later}}"><h2>Later--&gt;</a></h2>
   {{end}}
 </div>
 {{end}}
