diff --git a/profile.yml b/profile.yml
index ba99a59..6790cbf 100644
--- a/profile.yml
+++ b/profile.yml
@@ -1,5 +1,6 @@
 ---
 full_name: Johnny Codemaster
+location: Technolandia
 summary: >
   Enthusiastic and innovative software developer with a knack for turning caffeine into code.
   Armed with a wizard's wand (keyboard) and a magical hat (headphones), I've crafted digital
@@ -9,8 +10,8 @@ summary: >
 
 contact_details:
   Email: johnny@codemaster.me
-  GitPub: https://gitpub.site/johnnycodemaster
-  LinkedIO: https://linkedio.site/io/johnnycodemaster
+  GitHub: https://github.com/johnnycodemaster
+  LinkedIn: https://www.linkedin.com/in/johnnycodemaster
 
 experience:
   - title: Senior Sorcerer
@@ -83,19 +84,24 @@ experience:
       - MageQuery
 
 education:
-  - title: Bachelor of Science in Computer Science, Magic University
-    dates: 2005-2010
+  - school: Magic University
+    field_of_study: Bachelor of Science in Computer Science
+    dates: 2005 - 2010
 
 certificates:
   - title: Certificate in Advanced Spellcasting Techniques, Wizard Academy
+    date: 03/2022
   - title: Certificate in Cloud Sorcery, Cloud Academy
     url: https://www.cloud-academy.cert/johnnycodemaster
   - title: Certificate in Cybersecurity Enchantment, Cryptic College
+    date: 07/2019
     url: https://www.cryptic-college.cert/johnnycodemaster
 
 training:
   - title: Training in Potion Crafting for Software Engineers, Enchanted Institute
+    dates: 01/2021 - 07/2021
   - title: Training in Agile Spellcasting, Agile Wizards Institute
+    dates: 05/2022
     url: https://www.agile-wizards.training/johnnycodemaster
 
 skills: [PyroScript, ElixirCraft, HTML6, WizardJS, CharmSQL, Mystic Cloud Computing, AlchemyTensor, MageQuery]
diff --git a/templates/cv.html b/templates/cv.html
index 4abba10..05b193a 100644
--- a/templates/cv.html
+++ b/templates/cv.html
@@ -1,36 +1,66 @@
 {%- set max_exp_items_to_show = 3 -%}
 
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <title>{{ full_name }}'s CV</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.5.1/github-markdown-light.min.css">
+    <style>
+	    .markdown-body {
+    		box-sizing: border-box;
+    		min-width: 200px;
+    		max-width: 980px;
+    		margin: 0 auto;
+    		padding: 45px;
+    	}
+
+    	@media (max-width: 767px) {
+	    	.markdown-body {
+	    		padding: 15px;
+	    	}
+	    }
+
+        h3 + em {
+            position: relative;
+            top: -12px;
+        }
+        
+        .light {
+            color: #777;
+        }
+
+        .light2 {
+            color: #ccc;
+        }
+    </style>
 </head>
-<body>
+<body class="markdown-body">
     <h1>{{ full_name }}</h1>
 
-    {% for key, value in contact_details.items() %}
-        {{- key }}: <a href="{{ value }}">{{ value }}</a><br>
+    {{ location }} &nbsp;|&nbsp;
+    {%- for key, value in contact_details.items() %}
+        <a href="{{ value }}" title="{{ key }}">{{ key }}</a>{% if not loop.last %} <span class="light2">|</span> {% endif %}
     {% endfor %}
 
     <h2>Summary</h2>
     {{ summary }}
 
-    <h2>Experience<h2>
+    <h2>Experience</h2>
     {% for item in experience %}
     {%- if loop.index > max_exp_items_to_show %}
     {%- if loop.index == max_exp_items_to_show + 1 %}
     <h3>Earlier Experience</h3>
-    <em>Varios locations</em>
+    <em class="light">Varios locations</em>
     <ul>
     {% endif %}
-      <li>{{ item.title }}, <a href="{{ item.company_url }}">{{ item.company_name }}</a> ({{ item.dates }})</li>
+      <li>{{ item.title }}, <a href="{{ item.company_url }}">{{ item.company_name }}</a>, <em class="light">{{ item.dates }}</em></li>
     {%- if loop.last %}
         </ul>
     {% endif %}
     {%- else %}
     <h3>{{ item.title }}, <a href="{{ item.company_url }}">{{ item.company_name }}</a></h3>
-    <em>{{ item.dates}}, {{ item.location }}</em>
+    <em class="light">{{ item.dates}}, {{ item.location }}</em>
     <ul>
     {% for bullet_point in item.bullet_points %}
         <li>{{ bullet_point -}}</li>
@@ -40,27 +70,36 @@ <h3>{{ item.title }}, <a href="{{ item.company_url }}">{{ item.company_name }}</
     {% endif -%}
     {% endfor %}
 
-    <h2>Education<h2>
+    <h2>Education</h2>
     {% for item in education %}
-    <h3 style="margin-bottom:0">{{ item.title }}</h3>
-    <em>{{ item.dates}}</em>
+    <strong>{{ item.school }}</strong>, {{ item.field_of_study }}, <em class="light">{{ item.dates}}</em><br />
     {% endfor %}
 
-    <h2>Certifications and Training</h2>
+    <h2>Certifications</h2>
     <ul>
     {% for item in certificates %}
-    {% if item.url is defined and item.url|length %}
-        <li><a href="{{ item.url }}">{{ item.title -}}</a></li>
-    {% else %}
-        <li>{{ item.title -}}</li>
-    {% endif %}
+        <li>
+        {% if item.url is defined and item.url|length %}
+            <a href="{{ item.url }}">{{ item.title -}}</a>
+        {%- else %}
+            {{ item.title -}}
+        {% endif %}
+        {%- if item.date is defined and item.date|length %}, <em class="light">{{ item.date }}</em>{% endif %}
+        </li>
     {% endfor %}
+    </ul>
+
+    <h2>Training</h2>
+    <ul>
     {% for item in training %}
-    {% if item.url is defined and item.url|length %}
-        <li><a href="item.url">{{ item.title }}</a></li>
-    {% else %}
-        <li>{{ item.title }}</li>
-    {% endif %}
+    <li>
+        {% if item.url is defined and item.url|length %}
+            <a href="{{ item.url }}">{{ item.title -}}</a>
+        {%- else %}
+            {{ item.title -}}
+        {% endif %}
+        {%- if item.dates is defined and item.dates|length %}, <em class="light">{{ item.dates }}</em>{% endif %}
+        </li>
     {% endfor %}
     </ul>
 
diff --git a/templates/cv.md b/templates/cv.md
index 5177770..b4bb58a 100644
--- a/templates/cv.md
+++ b/templates/cv.md
@@ -2,24 +2,25 @@
 
 # {{ full_name }}
 
-{% for key, value in contact_details.items() %}
-{{- key }}: [{{ value }}]({{ value }}){% if not loop.last %} \{% endif %}
+{{ location }} |
+{% for key, value in contact_details.items() -%}
+[{{ key }}]({{ value }}){% if not loop.last %} | {% endif -%}
 {% endfor %}
 
+
 ## Summary
 
 {{ summary }}
 
 
 ## Experience
-
 {% for item in experience %}
 {%- if loop.index > max_exp_items_to_show %}
 {%- if loop.index == max_exp_items_to_show + 1 %}
 ### Earlier Experience
 _Varios locations_
 {% endif %}
- * {{ item.title }}, [{{ item.company_name }}]({{ item.company_url }}) _({{ item.dates }})_
+ * {{ item.title }}, [{{ item.company_name }}]({{ item.company_url }}), _{{ item.dates }}_
 {%- else %}
 ### {{ item.title }}, [{{ item.company_name }}]({{ item.company_url }})
 _{{ item.dates }}, {{ item.location }}_
@@ -34,24 +35,27 @@ _{{ item.keywords|join(", ") }}_
 
 ## Education
 {% for item in education %}
-### {{ item.title }}
-_{{ item.dates }}_
+**{{ item.school }}**, {{ item.field_of_study }}, _{{ item.dates }}_
 {% endfor %}
 
-## Certifications and Training
+## Certifications
 {% for item in certificates %}
 {%- if item.url is defined and item.url|length %}
  * [{{ item.title }}]({{ item.url }})
 {%- else %}
  * {{ item.title }}
 {%- endif -%}
+{%- if item.date is defined and item.date|length %}, _{{ item.date }}_{% endif -%}
 {% endfor %}
+
+## Training
 {%- for item in training -%}
 {% if item.url is defined and item.url|length %}
  * [{{ item.title }}]({{ item.url }})
 {%- else %}
  * {{ item.title }}
 {%- endif -%}
+{%- if item.dates is defined and item.dates|length %}, _{{ item.dates }}_{% endif -%}
 {% endfor %}
 
 
