diff --git a/index.html b/index.html
index 099d8b4..4d16b4e 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 layout: default
 portrait: assets/images/patrick.jpg
 author: Patrick van de Glind
-subtitle: Turn data into insights<br>Continuously learn and grow
+subtitle: Turn data into insights<br/>Continuously learn and grow
 email: naxels@gmail.com
 source: https://github.com/naxels/resume
 summary: >-
@@ -25,10 +25,10 @@ <h4 class="my-accent-font text-center text-muted text-nowrap">{{ page.subtitle }
     <div class="col-md-10">
       <h3 class="text-center" style="font-size: 2em; margin-top: .25em;">
         {% for network in site.data.networks %}
-        <a href="{{ network.url }}" target="_blank"
-          style="text-decoration: none; color: #6c757d; padding: .2em;">
-          <i class="{{ network.icon }}"></i>
-        </a>
+          <a href="{{ network.url }}" target="_blank"
+            style="text-decoration: none; color: #6c757d; padding: .2em;">
+            <i class="{{ network.icon }}"></i>
+          </a>
         {% endfor %}
       </h3>
     </div>
@@ -71,39 +71,39 @@ <h2 class="my-accent-font">Companies</h2>
         </div>
         <div class="card-body">
           {% for company in site.data.companies %}
-          <div class="row align-items-center">
-            <div class="col-6 order-1 col-sm-4 order-md-1">
-              <a href="{{ company.url }}" target="_blank">
-                <img class="img-fluid rounded" src="{{ company.image | relative_url }}">
-              </a>
-            </div>
-            <div class="col-24 order-3 col-md order-md-2">
-              <h3 class=""><strong>{{ company.name }}</strong></h3>
-            </div>
-            <div class="col-18 order-2 col-md-4 order-md-3">
-              <p class="text-muted text-right">{{ company.location }}</p>
-            </div>
-          </div>
-          {% for position in company.positions %}
-          <div class="row align-items-center">
-            <div class="col-24 col-md-20 offset-md-4 col-lg-20">
-              <h4>{{ position.name }}</h4>
-            </div>
-            <div class="col-24 col-md-5 col-lg-5">
-              <p class="text-muted text-left"><small>{{ position.dates }}</small></p>
-            </div>
-            <div class="col-24 col-md-19 col-lg-15 offset-lg-0">
-              <ul>
-                {% for point in position.points %}
-                <li class="text-muted">{{ point }}</li>
-                {% endfor %}
-              </ul>
+            <div class="row align-items-center">
+              <div class="col-6 order-1 col-sm-4 order-md-1">
+                <a href="{{ company.url }}" target="_blank">
+                  <img class="img-fluid rounded" src="{{ company.image | relative_url }}">
+                </a>
+              </div>
+              <div class="col-24 order-3 col-md order-md-2">
+                <h3 class=""><strong>{{ company.name }}</strong></h3>
+              </div>
+              <div class="col-18 order-2 col-md-4 order-md-3">
+                <p class="text-muted text-right">{{ company.location }}</p>
+              </div>
             </div>
-          </div>
-          {% endfor %}
-          {% if company != site.data.companies.last %}
-            <hr/>
-          {% endif %}
+            {% for position in company.positions %}
+              <div class="row align-items-center">
+                <div class="col-24 col-md-20 offset-md-4 col-lg-20">
+                  <h4>{{ position.name }}</h4>
+                </div>
+                <div class="col-24 col-md-5 col-lg-5">
+                  <p class="text-muted text-left"><small>{{ position.dates }}</small></p>
+                </div>
+                <div class="col-24 col-md-19 col-lg-15 offset-lg-0">
+                  <ul>
+                    {% for point in position.points %}
+                    <li class="text-muted">{{ point }}</li>
+                    {% endfor %}
+                  </ul>
+                </div>
+              </div>
+            {% endfor %}
+            {% if company != site.data.companies.last %}
+              <hr/>
+            {% endif %}
           {% endfor %}
         </div>
       </div>
@@ -114,25 +114,25 @@ <h2 class="my-accent-font">Education & Certifications</h2>
         </div>
         <div class="card-body">
           {% for school in site.data.schools %}
-          <div class="row align-items-center">
-            <div class="col-6 col-sm-4 order-lg-1 order-md-1">
-              <a href="{{ school.url }}" target="_blank">
-                <img class="img-fluid rounded" src="{{ school.image | relative_url }}">
-              </a>
-            </div>
-            <div class="col-18 col-lg order-lg-3 col-md order-md-3">
-              <p class="text-muted text-nowrap text-right">{{ school.description }}</p>
-            </div>
-            <div class="col-24 col-lg order-lg-2 col-md order-md-2">
-              <h3 class="text-nowrap">{{ school.name }}</h3>
-            </div>
-            <div class="col-24 col-lg order-lg-4 order-md-4">
-              <p class="text-muted text-right"><small>{{ school.dates }}</small></p>
+            <div class="row align-items-center">
+              <div class="col-6 col-sm-4 order-lg-1 order-md-1">
+                <a href="{{ school.url }}" target="_blank">
+                  <img class="img-fluid rounded" src="{{ school.image | relative_url }}">
+                </a>
+              </div>
+              <div class="col-18 col-lg order-lg-3 col-md order-md-3">
+                <p class="text-muted text-nowrap text-right">{{ school.description }}</p>
+              </div>
+              <div class="col-24 col-lg order-lg-2 col-md order-md-2">
+                <h3 class="text-nowrap">{{ school.name }}</h3>
+              </div>
+              <div class="col-24 col-lg order-lg-4 order-md-4">
+                <p class="text-muted text-right"><small>{{ school.dates }}</small></p>
+              </div>
             </div>
-          </div>
-          {% if school != site.data.school.last %}
-          <hr/>
-          {% endif %}
+            {% if school != site.data.school.last %}
+              <hr/>
+            {% endif %}
           {% endfor %}
         </div>
       </div>
@@ -143,25 +143,25 @@ <h2 class="my-accent-font">Current areas of interest</h2>
         </div>
         <div class="card-body">
           {% for organization in site.data.organizations %}
-          <div class="row align-items-center">
-            <div class="col-6 col-sm-4 order-lg-1 order-md-1">
-              <a href="{{ organization.url }}" target="_blank">
-                <img class="img-fluid rounded" src="{{ organization.image | relative_url }}">
-              </a>
-            </div>
-            <div class="col-18 col-lg order-lg-3 col-md order-md-3">
-              <p class="text-muted text-nowrap text-right">{{ organization.title }}</p>
-            </div>
-            <div class="col-24 col-lg order-lg-2 col-md order-md-2">
-              <h3 class="text-nowrap">{{ organization.name }}</h3>
-            </div>
-            <div class="col-24 col-lg order-lg-4 order-md-4">
-              <p class="text-muted text-right"><small>{{ organization.dates }}</small></p>
+            <div class="row align-items-center">
+              <div class="col-6 col-sm-4 order-lg-1 order-md-1">
+                <a href="{{ organization.url }}" target="_blank">
+                  <img class="img-fluid rounded" src="{{ organization.image | relative_url }}">
+                </a>
+              </div>
+              <div class="col-48 col-md-11 col-lg-9 order-lg-2 col-md order-md-2">
+                <h3 class="text-nowrap">{{ organization.name }}</h3>
+              </div>
+              <div class="col-18 col-md-7 col-lg-7 order-lg-3 col-md order-md-3">
+                <p class="text-muted text-nowrap text-left">{{ organization.title }}</p>
+              </div>
+              <div class="col-24 col-md-3 col-lg-3 order-lg-4 order-md-4">
+                <p class="text-muted text-right"><small>{{ organization.dates }}</small></p>
+              </div>
             </div>
-          </div>
-          {% if organization != site.data.organizations.last %}
-          <hr/>
-          {% endif %}
+            {% if organization != site.data.organizations.last %}
+              <hr/>
+            {% endif %}
           {% endfor %}
         </div>
       </div>
diff --git a/raw.html b/raw.html
index 2a21cb6..46c9dd4 100644
--- a/raw.html
+++ b/raw.html
@@ -2,7 +2,7 @@
 layout: default
 title: Resume
 author: Patrick van de Glind
-subtitle: Turn data into insights.
+subtitle: Turn data into insights<br/>Continuously learn and grow
 phone: +31615457709
 email: naxels@gmail.com
 link: https://naxels.github.io/resume
@@ -18,8 +18,8 @@ <h5>{{ page.subtitle }}</h5>
   </p>
   <p><strong>
     For full version of resume, please visit:<br/>
-    >>>>>&nbsp;<a href="https://naxels.github.io/resume" style="text-decoration: underline;">
-      https://naxels.github.io/resume
+    >>>>>&nbsp;<a href="{{ page.link }}" style="text-decoration: underline;">
+      {{ page.link }}
     </a>
   </strong></p>
   <br/>
@@ -35,9 +35,9 @@ <h3>Skills</h3>
   <br/>
   <h3>Work History</h3>
   {% for company in site.data.companies %}
-  <h4><strong>{{ company.name }} - {{ company.location }}</strong></h4>
+    <h4><strong>{{ company.name }} - {{ company.location }}</strong></h4>
     {% for position in company.positions %}
-    <h5>{{ position.dates }} - {{ position.name }}</h5>
+      <h5>{{ position.dates }} - {{ position.name }}</h5>
       <ul>
       {% for point in position.points %}
         <li>{{ point }}</li>
@@ -49,11 +49,11 @@ <h5>{{ position.dates }} - {{ position.name }}</h5>
   <br/>
   <h3>Education</h3>
   {% for school in site.data.schools %}
-  <h4><strong>{{ school.name }} - {{ school.location }}</h4>
+    <h4><strong>{{ school.name }} - {{ school.location }}</h4>
     <p>{{ school.dates }}</p>
     <ul>
     {% for point in school.points %}
-    <li>{{ point }}</li>
+      <li>{{ point }}</li>
     {% endfor %}
     </ul>
     <br/>