diff --git a/CONTRIBUTING b/CONTRIBUTING
index 63d1c08..d114f1d 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -5,3 +5,7 @@ If you want to close the issue:
 1. Fork the repository and work on the fix or the feature. Don't forget to add you name in the CONTRIBUTORS file, no matter how small is your fix, even if it's a typo :wink:
 2. Open a Pull Request with commits mentioning which issue are they fixing by adding in their description "Fixes #IssueNumber", in order to auto-resolve the issues after the Pull Request is merged into the master branch
 3. Consider joining our [Gitter](https://gitter.im/PanosSakkos/personal-jekyll-theme) channel in order to make our communication easier
+
+A few simple rules that have to be followed:
+
+1. No tabs allowed, two spaces should be used instead
diff --git a/_includes/about.html b/_includes/about.html
index 639b533..9261585 100644
--- a/_includes/about.html
+++ b/_includes/about.html
@@ -3,9 +3,9 @@
 
 <section id="{{ page.section-type }}" class="container content-section text-center">
   <div class="row">
-      <div class="col-lg-10 col-lg-offset-1">
-        {{ page.content | markdownify }}
-      </div>
+    <div class="col-lg-10 col-lg-offset-1">
+      {{ page.content | markdownify }}
+    </div>
   </div>
 </section>
 
diff --git a/_includes/contact.html b/_includes/contact.html
index 5d217da..d37bb12 100644
--- a/_includes/contact.html
+++ b/_includes/contact.html
@@ -2,36 +2,36 @@
 <!-- Contact Start -->
 
 <section id="{{ page.section-type }}" class="container content-section text-center">
-    <div class="row">
-        <div class="col-lg-10 col-lg-offset-1">
+  <div class="row">
+    <div class="col-lg-10 col-lg-offset-1">
 
-          {{ page.content | markdownify }}
+      {{ page.content | markdownify }}
 
-          {% if site.email %}
-            {% if site.email contains '@' %}
-              {% assign newemail = site.email | split: '@' %}
-                <p>
-                <script>
-                  function join_at_email(user, domain){
-                  return (user && domain)?(user + "@" + domain):"";
-                  }
-                  document.write('<a href="mailto:'
-                  + join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
-                  + '">'
-                  + join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
-                  + '</a>'
-                  );
-                  </script>
-                </p>
-            {% else %}
-              <p><a href="mailto:{{ site.email }}">{{ site.email }}</a></p>
-            {% endif %}
-          {% endif %}
+      {% if site.email %}
+        {% if site.email contains '@' %}
+          {% assign newemail = site.email | split: '@' %}
+            <p>
+            <script>
+              function join_at_email(user, domain){
+              return (user && domain)?(user + "@" + domain):"";
+              }
+              document.write('<a href="mailto:'
+              + join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
+              + '">'
+              + join_at_email( "{{ newemail[0] }}", "{{ newemail[1] }}" )
+              + '</a>'
+              );
+              </script>
+            </p>
+        {% else %}
+          <p><a href="mailto:{{ site.email }}">{{ site.email }}</a></p>
+        {% endif %}
+      {% endif %}
 
-          {% include social-buttons.html %}
+      {% include social-buttons.html %}
 
-        </div>
     </div>
+  </div>
 </section>
 
 <!-- Contact End -->
diff --git a/_includes/footer.html b/_includes/footer.html
index d87eea4..9d62a36 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
 
 <footer>
     <div class="container text-center">
-        <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
+      <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
     </div>
 </footer>
 
diff --git a/_includes/header.html b/_includes/header.html
index eedd7c7..f1d329d 100755
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -2,21 +2,21 @@
 <!-- Intro Start -->
 
 <header class="intro">
-    <div class="intro-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-10 col-md-offset-1">
-                    <h1 class="brand-heading">&nbsp;</h1>
-                    <h1 class="brand-heading">&nbsp;</h1>
-                    <span class="intro-text">{{ content }}</span>
-                    <h5>&nbsp;</h5>
-                    <a href="#{{ site.pages_list['About'] }}" class="page-scroll">
-                      <img class="img-me" src="{{site.baseurl}}{{ site.me-img }}" alt="">
-                    </a>
-                </div>
-            </div>
+  <div class="intro-body">
+    <div class="container">
+      <div class="row">
+          <div class="col-md-10 col-md-offset-1">
+            <h1 class="brand-heading">&nbsp;</h1>
+            <h1 class="brand-heading">&nbsp;</h1>
+            <span class="intro-text">{{ content }}</span>
+            <h5>&nbsp;</h5>
+            <a href="#{{ site.pages_list['About'] }}" class="page-scroll">
+              <img class="img-me" src="{{site.baseurl}}{{ site.me-img }}" alt="">
+            </a>
+          </div>
         </div>
     </div>
+  </div>
 </header>
 
 <!-- Intro End -->
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 3070f13..943fa72 100755
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -2,47 +2,50 @@
 <!-- Navigation Start -->
 
 <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                <i class="fa fa-bars"></i>
-            </button>
-            {% if page.section-type == "index" %}
-              <a class="navbar-brand page-scroll" href="#page-top">
-            {% else %}
-              <a class="navbar-brand page-scroll" href="{{site.baseurl}}/index.html#page-top">
-            {% endif %}
-            <div>{% if site.black-favicon %}<img src="{{site.baseurl}}{{ site.black-favicon }}" alt="">  {% endif %}{{ site.title }}</div>
-            </a>
-        </div>
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
-            <ul class="nav navbar-nav">
-                {% if page.section-type == "index" %}
-
-                  <!-- 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>
-                    </li>
-                  {% endfor %}
-
-                {% else %}
-                  <!-- Blog, Post, Tag 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>
-                    {% else %}
-                        <a class="page-scroll" href="{{site.baseurl}}/index.html#{{ p[1] }}"> {{ p[0] }}</a>
-                    {% endif %}
-                    </li>
-                  {% endfor %}
-                {% endif %}
-            </ul>
-        </div>
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
+        <i class="fa fa-bars"></i>
+      </button>
+      {% if page.section-type == "index" %}
+        <a class="navbar-brand page-scroll" href="#page-top">
+      {% else %}
+        <a class="navbar-brand" href="{{site.baseurl}}/index.html">
+      {% endif %}
+          <div>
+            {% if site.black-favicon %}<img src="{{site.baseurl}}{{ site.black-favicon }}" alt="">{% endif %}
+            {{ site.title }}
+          </div>
+        </a>
     </div>
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
+      <ul class="nav navbar-nav">
+        {% if page.section-type == "index" %}
+
+          <!-- 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>
+            </li>
+          {% endfor %}
+
+        {% else %}
+          <!-- Blog, Post, Tag 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>
+            {% else %}
+                <a class="page-scroll" href="{{site.baseurl}}/index.html#{{ p[1] }}"> {{ p[0] }}</a>
+            {% endif %}
+            </li>
+          {% endfor %}
+        {% endif %}
+      </ul>
+    </div>
+  </div>
 </nav>
 
 <!-- Navigation End -->
diff --git a/_includes/share.html b/_includes/share.html
index f0c6f6a..efe9dba 100644
--- a/_includes/share.html
+++ b/_includes/share.html
@@ -12,7 +12,7 @@
   {% if site.twitter-share %}
     <div style="float:left; padding: 0 5px; vertical-align:top">
       <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{site.url}}{{ site.baseurl}}{{page.url}}" data-text="{{page.title}} {% for tag in page.tags%}#{{ tag }} {% endfor %}"></a>
-  </div>
+    </div>
   {% endif %}
 
   {% if site.reddit-share %}
@@ -25,46 +25,47 @@
   {% endif %}
 
   {% if site.linkedin-share %}
-  <div style="float:left; padding: 0 5px; vertical-align:top; background-color: #0077B5; border-radius:3px">
-    <a style="color: #fff; vertical-align:middle; align: middle;" href="https://www.linkedin.com/cws/share?url={{site.url}}{{site.baseurl}}{{page.url}}&amp;title={{site.title}} | {{page.title}}&amp;lang=en_US" target="_blank"><i class="fa fa-linkedin"></i> | Share</a>
-  </div>
+    <div style="float:left; padding: 0 5px; vertical-align:top; background-color: #0077B5; border-radius:3px">
+      <a style="color: #fff; vertical-align:middle; align: middle;" href="https://www.linkedin.com/cws/share?url={{site.url}}{{site.baseurl}}{{page.url}}&amp;title={{site.title}} | {{page.title}}&amp;lang=en_US" target="_blank"><i class="fa fa-linkedin"></i> | Share</a>
+    </div>
   {% endif %}
 
   {% if site.google-plus-share %}
-  <div style="float:left; padding: 0 5px; vertical-align:top">
-    <script src="https://apis.google.com/js/platform.js" async defer></script>
-    <div class="g-plus" data-action="share" data-href="{{site.url}}{{ site.baseurl}}{{page.url}}" data-annotation="bubble"></div>
-  </div>
-  {% endif %}  
-
+    <div style="float:left; padding: 0 5px; vertical-align:top">
+      <script src="https://apis.google.com/js/platform.js" async defer></script>
+      <div class="g-plus" data-action="share" data-href="{{site.url}}{{ site.baseurl}}{{page.url}}" data-annotation="bubble"></div>
+    </div>
+  {% endif %}
 
   {% if site.vkontakte-share %}
-  <div style="float:left; padding: 0 5px; vertical-align:top; background-color: #0077B5; border-radius:3px">
-  <style type="text/css">
-    vk {color: #fff;}
-  </style>
-    <script type="text/javascript" src="http://vk.com/js/api/share.js?9"; charset="windows-1251"></script>
-    <script type="text/javascript">
-        document.write(VK.Share.button(
-        {
-            url: '{{site.url}}{{ site.baseurl}}{{page.url}}',
-            title: '{{site.title}} | {{page.title}}',
-            description: '{{page.description}}',
-        },
-        {
-            type: 'custom',
-            text: '<vk><i class="fa fa-vk"></i> Share</vk>'
-        }
-        ));
-    </script>
-  </div>
-  {% endif %}  
-</div>
+    <div style="float:left; padding: 0 5px; vertical-align:top; background-color: #0077B5; border-radius:3px">
+    <style type="text/css">
+      vk {color: #fff;}
+    </style>
+      <script type="text/javascript" src="http://vk.com/js/api/share.js?9"; charset="windows-1251"></script>
+      <script type="text/javascript">
+          document.write(VK.Share.button(
+          {
+              url: '{{site.url}}{{ site.baseurl}}{{page.url}}',
+              title: '{{site.title}} | {{page.title}}',
+              description: '{{page.description}}',
+          },
+          {
+              type: 'custom',
+              text: '<vk><i class="fa fa-vk"></i> Share</vk>'
+          }
+          ));
+      </script>
+    </div>
+  {% endif %}
 
   {% if site.pinterest-share %}
-  <div style="float:left; padding: 0 5px; vertical-align:top">
-    <script type="text/javascript" async defer src="//assets.pinterest.com/js/pinit.js"></script>
-    <a data-pin-do="buttonPin" href="https://www.pinterest.com/pin/create/button/" data-pin-config="beside" data-pin-description="{{page.description}}" data-pin-url="{{site.url}}{{ site.baseurl}}{{page.url}}"></a>
-  </div>
+    <div style="float:left; padding: 0 5px; vertical-align:top">
+      <script type="text/javascript" async defer src="//assets.pinterest.com/js/pinit.js"></script>
+      <a data-pin-do="buttonPin" href="https://www.pinterest.com/pin/create/button/" data-pin-config="beside" data-pin-description="{{page.description}}" data-pin-url="{{site.url}}{{ site.baseurl}}{{page.url}}"></a>
+    </div>
   {% endif %}
+
+</div>
+
 <!-- Share Buttons End -->
diff --git a/_includes/timeline.html b/_includes/timeline.html
index 3f5a0d7..11e0d83 100644
--- a/_includes/timeline.html
+++ b/_includes/timeline.html
@@ -2,44 +2,44 @@
 <!-- Timeline Start -->
 
 <section id="{{ page.section-type }}" class="container content-section text-center">
-    <div class="row">
-        <div class="col-lg-10 col-lg-offset-1">
+  <div class="row">
+    <div class="col-lg-10 col-lg-offset-1">
 
-          {{ page.content | markdownify }}
+      {{ page.content | markdownify }}
 
-          <ul class="timeline">
+      <ul class="timeline">
 
-            {% for event in site.events %}
-              {% assign loopindex = forloop.index | modulo: 2 %}
-              {% capture class %}
-              {% if loopindex == 0 %}
-                timeline-inverted
-              {% endif %}
-              {% endcapture %}
+        {% for event in site.events %}
+          {% assign loopindex = forloop.index | modulo: 2 %}
+          {% capture class %}
+          {% if loopindex == 0 %}
+            timeline-inverted
+          {% endif %}
+          {% endcapture %}
 
-              <li class="{{ class }}">
-                  <div class="timeline-image">
-                      <img class="img-circle img-responsive" src="{{site.baseurl}}{{ event.image }}" alt="">
-                  </div>
-                  <div class="timeline-panel">
-                      <div class="timeline-heading">
-                          <h4>{{ event.date }}</h4>
-                      </div>
-                      <div class="timeline-body">
-                          {{ event.description | markdownify }}
-                      </div>
-                  </div>
-              </li>
-            {% endfor %}
-
-            <li class="timeline-inverted">
-              <div class="timeline-image">
-                <img class="img-circle img-responsive" src="{{site.baseurl}}{{ site.career-img }}" alt="">
+          <li class="{{ class }}">
+            <div class="timeline-image">
+              <img class="img-circle img-responsive" src="{{site.baseurl}}{{ event.image }}" alt="">
+            </div>
+            <div class="timeline-panel">
+              <div class="timeline-heading">
+                <h4>{{ event.date }}</h4>
               </div>
-            </li>
-          </ul>
-        </div>
+              <div class="timeline-body">
+                {{ event.description | markdownify }}
+              </div>
+            </div>
+          </li>
+        {% endfor %}
+
+        <li class="timeline-inverted">
+          <div class="timeline-image">
+            <img class="img-circle img-responsive" src="{{site.baseurl}}{{ site.career-img }}" alt="">
+          </div>
+        </li>
+      </ul>
     </div>
+  </div>
 </section>
 
 <!-- Timeline End -->
diff --git a/_layouts/error.html b/_layouts/error.html
index 6b494d4..f2f1b57 100644
--- a/_layouts/error.html
+++ b/_layouts/error.html
@@ -24,7 +24,7 @@
               <div class="col-lg-10 col-lg-offset-1">
 
           {% include social-buttons.html %}
-</div></div>
+
         </div>
       </div>
     </section>