diff --git a/_includes/head.html b/_includes/head.html
index 8b7c57f..6f2762a 100755
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,21 +6,20 @@
     <script>
     // Don't force http when serving the website locally
     if (!(window.location.host.startsWith("127.0.0.1")) && (window.location.protocol != "https:"))
-        window.location.protocol = "https";
+      window.location.protocol = "https";
     </script>
   {% endif %}
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="description" content="{{ site.description }}">
-  <meta name="author" content="{{ site.author }}">
-  <meta name="keywords" content="{{ site.keywords }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
-  {% assign fourofour = "/404.html"%}
-  {% if page.url == {{fourofour}} | prepend: {{site.baseurl}} %}
+  <meta name="description" content="{{site.description}}">
+  <meta name="author" content="{{site.author}}">
+  <meta name="keywords" content="{{site.keyword}}">
+  <link rel="canonical" href="{{page.url | replace:'index.html','' | prepend: site.baseurl}}">
+  {% if page.url == "/404.html" | prepend: {{site.baseurl}} %}
     <meta http-equiv="refresh" content="20; url={{site.baseurl}}/">
   {% endif %}
-  <title>{{ site.title }} {% if page.title %} | {{ page.title }}{% endif %}</title>
+  <title>{{site.title}} {% if page.title %} | {{page.title}}{% endif %}</title>
 
   <!-- Bootstrap Core CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
@@ -43,7 +42,7 @@
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
   {% if site.favicon %}
-    <link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{ site.favicon }}">
+    <link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}{{site.favicon}}">
   {% endif %}
 </head>
 
diff --git a/_includes/latest-post.html b/_includes/latest-post.html
index b71f584..8799f17 100644
--- a/_includes/latest-post.html
+++ b/_includes/latest-post.html
@@ -16,7 +16,7 @@
 
         {{ post.content | truncatewords: site.post-preview-words | strip_html | markdownify }}
 
-        <a href="{{site.baseurl}}/blog/index.html"><h4><strong>View more posts</strong></h4></a>
+        <a href="{{site.baseurl}}/blog/"><h4><strong>View more posts</strong></h4></a>
 
       </div>
     </div>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 943fa72..c37757f 100755
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -26,19 +26,22 @@
           <!-- Scroll to section for each page in index -->
           {% for p in site.pages_list %}
             <li>
-              <a class="page-scroll" href="#{{ p[1] }}"> {{ p[0] }}</a>
+              <a class="page-scroll" href="#{{ p[1] }}"> {{p[0]}} </a>
             </li>
           {% endfor %}
 
         {% else %}
-          <!-- Blog, Post, Tag pages-->
+          <!-- Blog, Post, Tag and Error pages -->
           {% for p in site.pages_list %}
             <li>
-            {% comment %} If are blog, redirect to index.html of Blog {% endcomment %}
             {% if p[1] == "latest-post" %}
-                <a class="page-scroll" href="{{site.baseurl}}/blog/index.html"> {{ p[0] }}</a>
+              {% if page.url == "/blog/" | prepend: {{site.baseurl}} %}
+                <a class="page-scroll" href="#page"> {{p[0]}} </a>
+              {% else %}
+                <a href="{{site.baseurl}}/blog/"> {{p[0]}} </a>
+              {% endif %}
             {% else %}
-                <a class="page-scroll" href="{{site.baseurl}}/index.html#{{ p[1] }}"> {{ p[0] }}</a>
+                <a href="{{site.baseurl}}/#{{ p[1] }}"> {{p[0]}} </a>
             {% endif %}
             </li>
           {% endfor %}
diff --git a/_includes/pagination.html b/_includes/pagination.html
index 37247ed..f1de47a 100644
--- a/_includes/pagination.html
+++ b/_includes/pagination.html
@@ -6,7 +6,7 @@
   <h4>
 
   {% if paginator.previous_page %}
-    <a href="{{site.baseurl}}{{ paginator.previous_page_path }}" class="previous">Newer Posts</a>
+    <a href="{{site.baseurl}}{{paginator.previous_page_path}}" class="previous">Newer Posts</a>
   {% endif %}
 
   {% if paginator.previous_page and paginator.next_page %}
@@ -14,7 +14,7 @@
   {% endif %}
 
   {% if paginator.next_page %}
-    <a href="{{site.baseurl}}{{ paginator.next_page_path }}" class="next">Older Posts</a>
+    <a href="{{site.baseurl}}{{paginator.next_page_path}}" class="next">Older Posts</a>
   {% endif %}
 
   </h4>
diff --git a/_layouts/index.html b/_layouts/index.html
index 39fb4a6..1771d74 100755
--- a/_layouts/index.html
+++ b/_layouts/index.html
@@ -14,7 +14,7 @@
 
     {% for p in site.pages_list %}
       {% for page in site.pages %}
-        {% if p[1] == page.section-type%}
+        {% if p[1] == page.section-type %}
           {% include {{ page.path }} %}
         {% endif %}
       {% endfor %}
diff --git a/_layouts/tag.html b/_layouts/tag.html
index af33d9d..11662d6 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -24,7 +24,7 @@
           <div class="col-lg-10 col-lg-offset-2">
             {% for post in site.posts %}
               {% if post.tags contains tag %}
-                <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ post.category }} .</small> <a href="{{site.baseurl}}{{ post.url }}"> <strong>{{ post.title }} </a> </strong> <small><a href="{{site.baseurl}}{{post.url}}#disqus_thread">Comments</a></small></h4>
+                <h4 align="left"><strong>{{ post.date | date_to_string }}</strong> <small>. {{ post.category }} .</small> <a href="{{site.baseurl}}{{post.url}}"> <strong>{{ post.title }} </a> </strong> <small><a href="{{site.baseurl}}{{post.url}}#disqus_thread">Comments</a></small></h4>
               {% endif %}
             {% endfor %}
           </div>