diff --git a/cv.typ b/cv.typ
index aa480cf..3446626 100644
--- a/cv.typ
+++ b/cv.typ
@@ -210,7 +210,7 @@
 
 
   [*2024-06 - Present*], [
-    ITVitae, #fa-location-pin(fill: main_colour) Amersfoort \
+    #link("https://itvitae.nl/")[ITVitae, ]  #link("geo:52.145373, 5.352277")[#fa-location-pin(fill: main_colour) Amersfoort] \
     *Traineeship Data Science* \
     #set text(10pt)
     #arrow Educational traineeship data science and engineering \
@@ -222,7 +222,7 @@
   table.hline(stroke: secondary_colour),
 
   [*2021-10 - 2022-10*], [
-    Open State Foundation, #fa-location-pin(fill: main_colour) Amsterdam \
+    #link("https://openstate.eu/en/home/")[Open State Foundation, ] #link("geo:52.372139, 4.915571")[#fa-location-pin(fill: main_colour) Amsterdam] \
     *Full Stack Developer* \
     #set text(10pt)
     #arrow Working with flask web applications to update current projects like #link("https://waarismijnstemlokaal.nl") \
@@ -232,7 +232,7 @@
   ],
 
   [*2019-08 - 2020-08*], [
-    Carapax IT , #fa-location-pin(fill: main_colour) Gouda \
+    #link("https://www.carapaxit.nl/")[Carapax IT, ] #link("geo:52.017035, 4.705411")[#fa-location-pin(fill: main_colour) Gouda] \
     *Internship* \
     #set text(10pt)
     #arrow Health App Development in cooperation with data science project \
@@ -242,7 +242,7 @@
   table.hline(stroke: secondary_colour),
 
   [*2016-01 - 2016-06*], [
-    Sigrow IT, #fa-location-pin(fill: main_colour) Wageningen \
+    #link("https://openstate.eu/en/home/")[Sigrow IT, ] #link("geo:52.030226, 5.676264")[#fa-location-pin(fill: main_colour) Ede] \
     *Full-Stack Development Student Work* \
     #set text(10pt)
     #arrow Building a website showing live updates of crop sensors via websockets \
@@ -252,7 +252,7 @@
   table.hline(stroke: secondary_colour),
 
   [*2015-09 - 2015-12*], [
-    Hogeschool Utrecht, #fa-location-pin(fill: main_colour) Utrecht \
+    #link("https://www.hu.nl/")[Hogeschool Utrecht, ] #link("geo:52.084518, 5.175852")[#fa-location-pin(fill: main_colour) Utrecht] \
     *Student Assistent Teacher Python* \
     #set text(10pt)
     #arrow Instruction and support for students in Python 3.X \
@@ -262,8 +262,7 @@
   table.hline(stroke: secondary_colour),
 
   [*2014-11 - 2016-12*], [
-    Fraterhuis sint Joseph, #fa-location-pin(fill: main_colour) de Bilt \
-    *Porter* \
+    #link("https://fratersvanutrecht.nl/")[Fraterhuis Sint Jozef, ] #link("geo:52.096325, 5.210478")[#fa-location-pin(fill: main_colour) de Bilt] \
     #set text(10pt)
     #arrow Management of facilities and environments in a retirement-home-like setting, social
     engagement of inhabitants, and physical security incl. identity checks \
@@ -272,7 +271,7 @@
   [== Education], [],
 
   [*2014-09 - 2021-09*], [
-    Hogeschool Utrecht, #fa-location-pin(fill: main_colour) Utrecht \
+    #link("https://www.hu.nl/")[Hogeschool Utrecht, ] #link("geo:52.084518, 5.175852")[#fa-location-pin(fill: main_colour) Utrecht] \
     #fa-graduation-cap(main_colour) *Hogeschool Utrecht HBO-ICT Informatica (Unfinished due to personal issues at the time)* \
     #set text(10pt)
     #arrow Specialities: Data Science & Game Design (finished) \
@@ -281,7 +280,7 @@
   table.hline(stroke: secondary_colour),
 
   [*2009-09 - 2014-09*], [
-    Christelijk Lyceum Zeist, #fa-location-pin(fill: main_colour) Zeist \
+    #link("https://www.clz.nl/")[Christelijk Lyceum Zeist, ] #link("geo:52.093039, 5.256381")[#fa-location-pin(fill: main_colour) Zeist] \
     #fa-bus(main_colour) *HAVO (high school diploma)* \
     #set text(10pt)
     #arrow Dual Diploma: NG & NT, technical, scientific, and health subjects\
@@ -291,7 +290,7 @@
   [== Volunteer Experience], [],
 
   [*2020-09 - 2022-06*], [
-    ASV Anteros, #fa-location-pin(fill: main_colour) Utrecht \
+    #link("https://www.uhsv-anteros.nl/")[U.H.S.V Anteros, ] #link("geo:52.088061, 5.165947")[#fa-location-pin(fill: main_colour) Utrecht] \
     *Societal Commission Member in Student Association* \
     #set text(10pt)
     #arrow Organising events like book clubs with a societal impact, voting information afternoons, and #rainbow[LGBTQ+] history information walks \
@@ -303,8 +302,8 @@
 
 
   [*2020-11 - 2021-10*], [
-    Utrecht, #fa-location-pin(fill: main_colour) Utrecht \
-    *Volunteer at local Political Party* \
+    #link("https://en.wikipedia.org/wiki/Utrecht/")[Utrecht, ] #link("geo:52.0907, 5.121564")[#fa-location-pin(fill: main_colour) Utrecht] \
+    *Volunteer for Local Political Party* \
     #set text(10pt)
     #arrow Talking in workgroups on policy, structure, and working to improve processes \
     #arrow Organising a local group, and networking with people inside and out the party \