diff --git a/layouts/index.html b/layouts/index.html
index 9cf1913..c8d16a1 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -25,7 +25,7 @@
       <div class="masthead">
         <div class="container">
           <h3 class="masthead-title">
-            <a href="{{ .Site.BaseUrl }}" title="Home">Home</a>
+            <a href="/" title="Home">Home</a>
           </h3>
         </div>
       </div>
diff --git a/layouts/posts/summary.html b/layouts/posts/summary.html
index 5021ca9..d4493b0 100644
--- a/layouts/posts/summary.html
+++ b/layouts/posts/summary.html
@@ -13,7 +13,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='{{ .Permalink }}'> {{ .Title }}</a> </h2>
+      <h2><a href='{{ .Url }}'> {{ .Title }}</a> </h2>
       <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>
     </header>
 
diff --git a/public/categories/blah/index.html b/public/categories/blah/index.html
index 98713f5..cf43697 100644
--- a/public/categories/blah/index.html
+++ b/public/categories/blah/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/oldest'> First Post</a> </h2>
+      <h2><a href=''> First Post</a> </h2>
       <div class="meta">Thu, Mar 27, 2014</div>
     </header>
 
diff --git a/public/categories/boring/index.html b/public/categories/boring/index.html
index aec989c..6bb0e50 100644
--- a/public/categories/boring/index.html
+++ b/public/categories/boring/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/middle'> Second Post</a> </h2>
+      <h2><a href=''> Second Post</a> </h2>
       <div class="meta">Fri, Mar 28, 2014</div>
     </header>
 
diff --git a/public/categories/fun/index.html b/public/categories/fun/index.html
index d86103f..28f8dfe 100644
--- a/public/categories/fun/index.html
+++ b/public/categories/fun/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/newest'> Just another sample post</a> </h2>
+      <h2><a href=''> Just another sample post</a> </h2>
       <div class="meta">Sat, Mar 29, 2014</div>
     </header>
 
diff --git a/public/categories/hugo/index.html b/public/categories/hugo/index.html
index fee82ff..a6cdb5d 100644
--- a/public/categories/hugo/index.html
+++ b/public/categories/hugo/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/newest'> Just another sample post</a> </h2>
+      <h2><a href=''> Just another sample post</a> </h2>
       <div class="meta">Sat, Mar 29, 2014</div>
     </header>
 
diff --git a/public/categories/index.html b/public/categories/index.html
index a2892d3..1e79ddc 100644
--- a/public/categories/index.html
+++ b/public/categories/index.html
@@ -62,6 +62,10 @@
               
               <li><a href="/categories/test"> test </a> (2 entries) </li>
               
+              <li><a href="/categories/boring"> boring </a> (1 entries) </li>
+              
+              <li><a href="/categories/blah"> blah </a> (1 entries) </li>
+              
               <li><a href="/categories/hugo"> hugo </a> (1 entries) </li>
               
               <li><a href="/categories/fun"> fun </a> (1 entries) </li>
@@ -70,10 +74,6 @@
               
               <li><a href="/categories/second"> second </a> (1 entries) </li>
               
-              <li><a href="/categories/boring"> boring </a> (1 entries) </li>
-              
-              <li><a href="/categories/blah"> blah </a> (1 entries) </li>
-              
             </ul>
           </div>
         </section>
diff --git a/public/categories/second/index.html b/public/categories/second/index.html
index f5505ba..6210c28 100644
--- a/public/categories/second/index.html
+++ b/public/categories/second/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/middle'> Second Post</a> </h2>
+      <h2><a href=''> Second Post</a> </h2>
       <div class="meta">Fri, Mar 28, 2014</div>
     </header>
 
diff --git a/public/categories/template/index.html b/public/categories/template/index.html
index 82b62d5..35a41f1 100644
--- a/public/categories/template/index.html
+++ b/public/categories/template/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/middle'> Second Post</a> </h2>
+      <h2><a href=''> Second Post</a> </h2>
       <div class="meta">Fri, Mar 28, 2014</div>
     </header>
 
diff --git a/public/categories/test/index.html b/public/categories/test/index.html
index 7853bd3..a59bdf1 100644
--- a/public/categories/test/index.html
+++ b/public/categories/test/index.html
@@ -65,7 +65,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/newest'> Just another sample post</a> </h2>
+      <h2><a href=''> Just another sample post</a> </h2>
       <div class="meta">Sat, Mar 29, 2014</div>
     </header>
 
@@ -80,7 +80,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/oldest'> First Post</a> </h2>
+      <h2><a href=''> First Post</a> </h2>
       <div class="meta">Thu, Mar 27, 2014</div>
     </header>
 
diff --git a/public/index.html b/public/index.html
index 9b6b7e3..28cee84 100644
--- a/public/index.html
+++ b/public/index.html
@@ -47,7 +47,7 @@
       <div class="masthead">
         <div class="container">
           <h3 class="masthead-title">
-            <a href="/sglyon.com/hugo_gh_blog" title="Home">Home</a>
+            <a href="/" title="Home">Home</a>
           </h3>
         </div>
       </div>
@@ -78,7 +78,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/newest'> Just another sample post</a> </h2>
+      <h2><a href=''> Just another sample post</a> </h2>
       <div class="meta">Sat, Mar 29, 2014</div>
     </header>
 
@@ -93,7 +93,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/middle'> Second Post</a> </h2>
+      <h2><a href=''> Second Post</a> </h2>
       <div class="meta">Fri, Mar 28, 2014</div>
     </header>
 
@@ -108,7 +108,7 @@
 
 <article class="post">
     <header>
-      <h2><a href='/posts/oldest'> First Post</a> </h2>
+      <h2><a href=''> First Post</a> </h2>
       <div class="meta">Thu, Mar 27, 2014</div>
     </header>