diff --git a/src/partials/contact.html b/src/partials/contact.html
index 87dde10..7b94f2c 100644
--- a/src/partials/contact.html
+++ b/src/partials/contact.html
@@ -1,7 +1,34 @@
 <header>
   <h1>{{{r.name}}}</h1>
-  {{#if r.location.city}}<h4><span class="fa fa-fw fa-map-marker"></span>&nbsp;{{r.location.city}}{{#if r.location.region}}, {{r.location.region}}{{/if}}{{#if r.location.country}}, {{r.location.country}}{{/if}}</h4>{{/if}}
-  {{#if r.contact.email}}<h4><span class="fa fa-fw fa-envelope"></span>&nbsp;<a href="mailto:{{r.contact.email}}">{{r.contact.email}}</a></h4>{{/if}}
-  {{#if r.contact.phone}}<h4><span class="fa fa-fw fa-phone"></span>&nbsp;{{r.contact.phone}}</h4>{{/if}}
-  {{#if r.contact.website}}<h4><span class="fa fa-fw fa-link"></span>&nbsp;<a href="{{RAW.contact.website}}">{{RAW.contact.website}}</a></h4>{{/if}}
+  {{#if r.location.city}}
+    <h4><span class="fa fa-fw fa-map-marker"></span>&nbsp;{{r.location.city}}{{#if r.location.region}}, {{r.location.region}}{{/if}}{{#if r.location.country}}, {{r.location.country}}{{/if}}</h4>
+  {{/if}}
+  {{#if r.contact.email}}
+    <h4><span class="fa fa-fw fa-envelope"></span>&nbsp;<a href="mailto:{{r.contact.email}}">{{r.contact.email}}</a></h4>
+  {{/if}}
+  {{#if r.contact.phone}}
+    <h4><span class="fa fa-fw fa-phone"></span>&nbsp;{{r.contact.phone}}</h4>
+  {{/if}}
+  {{#if r.contact.website}}
+    <h4><span class="fa fa-fw fa-link"></span>&nbsp;<a href="{{RAW.contact.website}}">{{RAW.contact.website}}</a></h4>
+  {{/if}}
+  {{#if r.social}}
+    {{#each r.social}}
+      {{#compare network "GitHub" operator="=="}}
+        <h4><span class="fa fa-fw fa-github"></span>&nbsp;<a href="{{{url}}}">{{{url}}}</a></h4>
+      {{/compare}}
+      {{#compare network "Bitbucket" operator="=="}}
+        <h4><span class="fa fa-fw fa-bitbucket"></span>&nbsp;<a href="{{{url}}}">{{{url}}}</a></h4>
+      {{/compare}}
+      {{#compare network "LinkedIn" operator="=="}}
+        <h4><span class="fa fa-fw fa-linkedin"></span>&nbsp;<a href="{{{url}}}">{{{url}}}</a></h4>
+      {{/compare}}
+      {{#compare network "Twitter" operator="=="}}
+        <h4><span class="fa fa-fw fa-twitter"></span>&nbsp;<a href="{{{url}}}">{{{url}}}</a></h4>
+      {{/compare}}
+      {{#compare network "Facebook" operator="=="}}
+        <h4><span class="fa fa-fw fa-facebook"></span>&nbsp;<a href="{{{url}}}">{{{url}}}</a></h4>
+      {{/compare}}
+    {{/each}}
+  {{/if}}
 </header>
diff --git a/test/resume.json b/test/resume.json
index bf817ab..8043945 100644
--- a/test/resume.json
+++ b/test/resume.json
@@ -88,7 +88,6 @@
   ],
 
   "social": [
-
     {
       "label": "GitHub",
       "network": "GitHub",