diff --git a/content.yml b/content.yml
index e0a7dab..c689421 100644
--- a/content.yml
+++ b/content.yml
@@ -5,12 +5,16 @@ about:
       icon: 
     - text: contact@martyoeh.me
       icon: 
+      link: mailto:contact@martyoeh.me
     - text: +49 177 377 4949
       icon: 
+      link: tel:+491773774949
     - text: martyoeh.me
       icon: 
+      link: https://martyoeh.me
     - text: github.com/marty-oehme
       icon: 
+      link: https://github.com/marty-oehme
 summary:
   de: | # FIXME: Update from English summary below
     Ich habe im September 2021 das EU-geförderte European Master of Global Studies Studienprogramm absolviert,
diff --git a/cv.typ b/cv.typ
index 5c2281e..133fbce 100644
--- a/cv.typ
+++ b/cv.typ
@@ -33,6 +33,22 @@
 
 #set par(justify: true)
 
+#let header(about, columns: (1.5fr, 1fr, 1fr)) = {
+    [= #about.fullname];
+    let contact_fields = (for c in about.contact {
+        if "link" in c {
+            ([#c.icon ~ #link(c.link)[#c.text]],)
+        } else {
+            ([#c.icon ~ #c.text],)
+        }
+    })
+    grid(
+        columns: columns,
+        gutter: 5pt,
+        ..contact_fields
+    );
+}
+
 #let horizon_line() = {v(-3pt); line(length: 100%); v(-5pt)}
 
 #let section_header(title) = {[== #title]; horizon_line()};
@@ -93,20 +109,14 @@
     }
 }
 
+
 #let resume(contents) = {
-    [= #contents.about.fullname];
-    let contacts = (for c in contents.about.contact {
-        (c.icon + "  " + c.text,)
-    })
-    grid(
-        columns: (1.5fr, 1fr, 1fr),
-        gutter: 5pt,
-        ..contacts
-    );
-    horizon_line();
+    header(contents.about)
     if "summary" in contents {
+        section(title:"", {
             contents.summary.at(lang)
-        };
+        })
+    };
 
     if "experience" in contents {
         let title = sel_word_lang(en:"Professional Experience", de:"Berufserfahrung")