diff --git a/src/app/components/cv/cv.component.html b/src/app/components/cv/cv.component.html
index 6cd6b82..b63eb9a 100644
--- a/src/app/components/cv/cv.component.html
+++ b/src/app/components/cv/cv.component.html
@@ -1,9 +1,15 @@
 <div class="educationblock">
-  <div class="blocktitle">Education</div>
+  <app-languagetoggle [language]="'nl'">
+    <div class="blocktitle">Opleiding</div>
+  </app-languagetoggle>
+  <app-languagetoggle [language]="'en'">
+    <div class="blocktitle">Education</div>
+  </app-languagetoggle>
   <div class="blockcontent">
     <div *ngFor="let educationItem of getEducationItems()" class="experience-item-block">
       <div class="imgblock">
-        <img *ngIf="educationItem.iconName != null" src="{{educationItem.iconName}}" alt="..." class="img-thumbnail img-fluid cv-item-thumbnail">
+        <img *ngIf="educationItem.iconName != null" src="{{educationItem.iconName}}" alt="..."
+             class="img-thumbnail img-fluid cv-item-thumbnail">
       </div>
       <div class="cvitem-text">
         <div class="firstline">
@@ -31,7 +37,8 @@
   <div class="blockcontent">
     <div *ngFor="let experienceItem of getExperienceItems()" class="experience-item-block">
       <div class="imgblock">
-        <img *ngIf="experienceItem.iconName != null" src="{{experienceItem.iconName}}" alt="..." class="img-thumbnail img-fluid cv-item-thumbnail">
+        <img *ngIf="experienceItem.iconName != null" src="{{experienceItem.iconName}}" alt="..."
+             class="img-thumbnail img-fluid cv-item-thumbnail">
       </div>
       <div class="cvitem-text">
         <div class="lead">
diff --git a/src/app/components/cv/cv.component.ts b/src/app/components/cv/cv.component.ts
index aacd816..73d3309 100644
--- a/src/app/components/cv/cv.component.ts
+++ b/src/app/components/cv/cv.component.ts
@@ -1,5 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CVTimeLineItem} from '../../model/educationitem';
+import {StateService} from '../../services/state.service';
 
 @Component({
   selector: 'app-cv',
@@ -8,43 +9,86 @@ import {CVTimeLineItem} from '../../model/educationitem';
 })
 export class CvComponent implements OnInit {
 
-  constructor() { }
+  constructor(private stateService: StateService) {
+  }
 
   ngOnInit() {
   }
 
   getEducationItems(): CVTimeLineItem[] {
-    return [
+    const temp = [
+
       new CVTimeLineItem()
-        .setLanguage("nl")
+        .setLanguage('nl')
         .setEmployer('Universiteit Gent')
         .setTitle('Doctor in de ingenieurswetenschappen: computerwetenschappen')
-        .setDescription('Manuscript: "XPath-gebaseerde informatie-extractie" - informatie extraheren uit semi-gestructureerde documenten zoals HTML, gebruik makend van XPath')
+        .setDescription('Manuscript: "XPath-gebaseerde informatie-extractie" - informatie extraheren uit semi-gestructureerde documenten ' +
+          'zoals HTML, gebruik makend van XPath')
         .setFromYear(2010)
         .setToYear(2017)
-        .setIconName("assets/images/ugent-icon.png"),
+        .setIconName('assets/images/ugent-icon.png'),
       new CVTimeLineItem()
-        .setLanguage("nl")
+        .setLanguage('en')
+        .setEmployer('Ghent University')
+        .setTitle('Doctor of Computer Science Engineering')
+        .setDescription('Manuscript: "XPath-based information extraction" - extraction of information from semi-structured documents, such as ' +
+          'HTML, using XPath')
+        .setFromYear(2010)
+        .setToYear(2017)
+        .setIconName('assets/images/ugent-icon.png'),
+
+      new CVTimeLineItem()
+        .setLanguage('nl')
         .setEmployer('Universiteit Gent')
         .setTitle('Master, computerwetenschappen - software ontwikkeling, cum laude')
         .setFromYear(2003)
         .setToYear(2010)
-        .setIconName("assets/images/ugent-icon.png"),
+        .setIconName('assets/images/ugent-icon.png'),
+      new CVTimeLineItem()
+        .setLanguage('en')
+        .setEmployer('Ghent University')
+        .setTitle('Master, computer sciences - software engineering, cum laude')
+        .setFromYear(2003)
+        .setToYear(2010)
+        .setIconName('assets/images/ugent-icon.png'),
+
       new CVTimeLineItem()
         .setLanguage('nl')
         .setEmployer('Leonardo Lyceum/Pestalozzi')
         .setTitle('Latijn + Wetenschappen / Wiskunde')
         .setFromYear(1999)
         .setToYear(2003)
-        .setIconName("assets/images/pestalozzi-icon.png"),
+        .setIconName('assets/images/pestalozzi-icon.png'),
+      new CVTimeLineItem()
+        .setLanguage('en')
+        .setEmployer('Leonardo Lyceum/Pestalozzi')
+        .setTitle('Latin + Sciences / Math')
+        .setFromYear(1999)
+        .setToYear(2003)
+        .setIconName('assets/images/pestalozzi-icon.png'),
+
       new CVTimeLineItem()
         .setLanguage('nl')
         .setEmployer('Leonardo Lyceum Esemnegen')
         .setTitle('Latijn')
         .setFromYear(1997)
         .setToYear(1999)
-        .setIconName("assets/images/zotvana.jpg"),
+        .setIconName('assets/images/zotvana.jpg'),
+      new CVTimeLineItem()
+        .setLanguage('en')
+        .setEmployer('Leonardo Lyceum Esemnegen')
+        .setTitle('Latin')
+        .setFromYear(1997)
+        .setToYear(1999)
+        .setIconName('assets/images/zotvana.jpg'),
     ];
+    const res = new Array<CVTimeLineItem>();
+    temp.forEach(value => {
+      if (value.language === this.stateService.getLanguage()) {
+        res.push(value);
+      }
+    });
+    return res;
   }
 
   getExperienceItems(): CVTimeLineItem[] {
@@ -54,24 +98,24 @@ export class CvComponent implements OnInit {
         .setEmployer('Universiteit Gent')
         .setDescription('Postdoctoral researcher')
         .setFromYear(2017)
-        .setFromMonth("mar")
-        .setIconName("assets/images/ugent-icon.png"),
+        .setFromMonth('mar')
+        .setIconName('assets/images/ugent-icon.png'),
       new CVTimeLineItem()
         .setLanguage('nl')
         .setEmployer('Universiteit Gent')
         .setDescription('PhD student / assistent')
         .setFromYear(2010)
         .setToYear(2017)
-        .setIconName("assets/images/ugent-icon.png")
-        .setFromMonth("apr").setToMonth("mar"),
+        .setIconName('assets/images/ugent-icon.png')
+        .setFromMonth('apr').setToMonth('mar'),
       new CVTimeLineItem()
         .setLanguage('nl')
         .setEmployer('Oxynade')
         .setDescription('Software developer')
         .setFromYear(2009)
         .setToYear(2010)
-        .setIconName("assets/images/oxynade-icon.png")
-        .setFromMonth("nov").setToMonth("apr")
+        .setIconName('assets/images/oxynade-icon.png')
+        .setFromMonth('nov').setToMonth('apr')
     ];
   }
 
diff --git a/src/app/components/post/post.component.scss b/src/app/components/post/post.component.scss
index 23101e2..61e2190 100644
--- a/src/app/components/post/post.component.scss
+++ b/src/app/components/post/post.component.scss
@@ -20,6 +20,8 @@
 
 .post-date {
   flex-direction: row;
+  font-weight: bold;
+  font-style: italic;
 }
 
 .post-tags {