diff --git a/_data/data.yml b/_data/data.yml
index 63c6517..257969c 100644
--- a/_data/data.yml
+++ b/_data/data.yml
@@ -19,8 +19,11 @@ sidebar:
     website: blog.webjeda.com #do not add http://
     linkedin: alandoe
     github: sharu725
+    gitlab:
+    bitbucket:
     twitter: '@webjeda'
-    codewars: codewars_username
+    stack-overflow: # Number/Username, e.g. 123456/alandoe
+    codewars:
 
     languages:
         - language:
diff --git a/_includes/contact.html b/_includes/contact.html
new file mode 100644
index 0000000..eff437e
--- /dev/null
+++ b/_includes/contact.html
@@ -0,0 +1,65 @@
+<div class="contact-container container-block">
+    <ul class="list-unstyled contact-list">
+
+        {% if site.data.data.sidebar.email %}
+        <li class="email"><i class="fas fa-envelope"></i>
+            <a href="mailto:{{ site.data.data.sidebar.email }}">{{ site.data.data.sidebar.email }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.phone %}
+        <li class="phone"><i class="fas fa-phone"></i>
+            <a href="tel:{{ site.data.data.sidebar.phone }}">{{ site.data.data.sidebar.phone }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.website %}
+        <li class="website"><i class="fas fa-globe-americas"></i>
+            <a href="http://{{ site.data.data.sidebar.website }}" target="_blank">{{ site.data.data.sidebar.website }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.linkedin %}
+        <li class="linkedin"><i class="fab fa-linkedin"></i>
+            <a href="https://linkedin.com/in/{{ site.data.data.sidebar.linkedin }}" target="_blank">{{ site.data.data.sidebar.linkedin }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.github %}
+        <li class="github"><i class="fab fa-github"></i>
+            <a href="http://github.com/{{ site.data.data.sidebar.github }}" target="_blank">{{ site.data.data.sidebar.github }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.gitlab %}
+        <li class="gitlab"><i class="fab fa-gitlab"></i>
+            <a href="http://gitlab.com/{{ site.data.data.sidebar.gitlab }}" target="_blank">{{ site.data.data.sidebar.gitlab }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.bitbucket %}
+        <li class="bitbucket"><i class="fab fa-bitbucket"></i>
+            <a href="http://bitbucket.com/{{ site.data.data.sidebar.bitbucket }}" target="_blank">{{ site.data.data.sidebar.bitbucket }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.twitter %}
+        <li class="twitter"><i class="fab fa-twitter"></i>
+            <a href="https://twitter.com/{{ site.data.data.sidebar.twitter }}" target="_blank">{{ site.data.data.sidebar.twitter }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.stack-overflow %}
+        <li class="stack-overflow"><i class="fab fa-stack-overflow"></i>
+            <a href="https://stackoverflow.com/users/{{ site.data.data.sidebar.stack-overflow }}" target="_blank">{{ site.data.data.sidebar.stack-overflow }}</a>
+        </li>
+        {% endif %}
+
+        {% if site.data.data.sidebar.codewars %}
+        <li class="codewars"><i class="fas fa-code"></i>
+            <a href="https://www.codewars.com/users/{{ site.data.data.sidebar.codewars }}/completed_solutions" target="_blank">{{ site.data.data.sidebar.codewars }}</a>
+        </li>
+        {% endif %}
+
+    </ul>
+</div><!--//contact-container-->
\ No newline at end of file
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 13c3dc0..71b0b72 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -8,48 +8,16 @@
        {% endif %}
 
        {% if site.data.data.sidebar.name %}
-       <h1 class="name">{{site.data.data.sidebar.name}}</h1>
+       <h1 class="name">{{ site.data.data.sidebar.name }}</h1>
        {% endif %}
 
        {% if site.data.data.sidebar.tagline %}
-       <h3 class="tagline">{{site.data.data.sidebar.tagline}}</h3>
+       <h3 class="tagline">{{ site.data.data.sidebar.tagline }}</h3>
        {% endif %}
 
    </div><!--//profile-container-->
 
-   <div class="contact-container container-block">
-       <ul class="list-unstyled contact-list">
-
-          {% if site.data.data.sidebar.email %}
-           <li class="email"><i class="fas fa-envelope"></i><a href="mailto: {{site.data.data.sidebar.email}}">{{site.data.data.sidebar.email}}</a></li>
-           {% endif %}
-
-           {% if site.data.data.sidebar.phone %}
-           <li class="phone"><i class="fas fa-phone"></i><a href="tel:{{site.data.data.sidebar.phone}}">{{site.data.data.sidebar.phone}}</a></li>
-           {% endif %}
-
-           {% if site.data.data.sidebar.website %}
-           <li class="website"><i class="fas fa-globe-americas"></i><a href="http://{{site.data.data.sidebar.website}}" target="_blank">{{site.data.data.sidebar.website}}</a></li>
-           {% endif %}
-
-           {% if site.data.data.sidebar.linkedin %}
-           <li class="linkedin"><i class="fab fa-linkedin"></i><a href="https://linkedin.com/in/{{site.data.data.sidebar.linkedin}}" target="_blank">{{site.data.data.sidebar.linkedin}}</a></li>
-           {% endif %}
-
-           {% if site.data.data.sidebar.github %}
-           <li class="github"><i class="fab fa-github"></i><a href="http://github.com/{{site.data.data.sidebar.github}}" target="_blank">{{site.data.data.sidebar.github}}</a></li>
-           {% endif %}
-
-           {% if site.data.data.sidebar.twitter %}
-           <li class="twitter"><i class="fab fa-twitter"></i><a href="https://twitter.com/{{site.data.data.sidebar.twitter}}" target="_blank">{{site.data.data.sidebar.twitter}}</a></li>
-           {% endif %}
-          
-           {% if site.data.data.sidebar.codewars %}
-           <li class="codewars"><i class="fas fa-code"></i><a href="https://www.codewars.com/users/{{site.data.data.sidebar.codewars}}/completed_solutions" target="_blank">{{site.data.data.sidebar.codewars}}</a></li>
-           {% endif %}
-
-       </ul>
-   </div><!--//contact-container-->
+   {% include contact.html %}
 
   {% if site.education_in_main == null or site.education_in_main == false %}
     {% include education.html %}