diff --git a/cv2.typ b/cv2.typ
index 0338414..2d54e12 100644
--- a/cv2.typ
+++ b/cv2.typ
@@ -24,21 +24,13 @@
 }
 
 #show(heading.where(level: 2)): it => {
+  // v(-2pt)
   box(
     fill: sect_title_color,
     inset: 3pt,
     text(white, upper(it))
   )
-}
-
-#let cvsect(title) = {
-  v(8pt)
-  box(
-    fill: sect_title_color,
-    inset: (x: 3pt, y: 2pt),
-    text(white, weight: "bold", upper(title))
-  )
-  v(5pt)
+  // v(-4pt)
 }
 
 #let entry(date, title, subtitle, content) = {
@@ -59,6 +51,7 @@
 #set document(author: "Joshua Coles", title: "CV")
 #set page(margin: (x: 2cm, y: 1.75cm), paper: "a4")
 #set text(font: "Raleway", size: 9pt)
+#set par(spacing: 1.1em)
 
 // Header
 #grid(
@@ -97,7 +90,7 @@
 == Who am I?
 
 #grid(
-  columns: (70%, 27.5%),
+  columns: (90%),
   {
     [I am a passionate and adaptable software engineer with a strong focus on delivering high-quality, maintainable solutions. With experience across a range of technologies and industries, I thrive on understanding the business and organisational context behind software, ensuring that technical solutions align with real-world needs.
     I believe that effective communication, problem-solving, and a willingness to continuously learn and adapt are key to delivery effective solutions.
@@ -106,7 +99,7 @@
 )
 
 // Experience section
-#cvsect("Experience")
+== Experience
 
 #entry(
   "Present",
@@ -124,9 +117,9 @@
 )
 
 #entry(
-  "Final Year",
-  "Dissertation Project, AI Applications in Lagrangian Physics",
-  "University of Bath",
+  [Final Year],
+  [Dissertation Project, AI Applications in Lagrangian Physics],
+  [University of Bath],
   [
     My dissertation focused on incorporating Lagrangian Mechanics into physics-informed neural networks. My key contributions include,
     - Creating and optimising the core physics procedures in JAX to improve correctness compared to legacy implementations; allow for their use in loss functions; and reducing runtimes by a factor of $10^4$.
@@ -139,9 +132,9 @@
 )
 
 #entry(
-  "Summer 2023",
-  "Software Developer",
-  "Better Conversations Foundation & Amphora",
+  [Summer 2023],
+  [Software Developer],
+  [Better Conversations Foundation & Amphora],
   [
     I lead efforts exploring the feasibility and application of AI based features in the main product.
     - Integrating vector based search and retrieval-augmented generation into the application in a non-intrusive manner.
@@ -156,9 +149,12 @@
 )
 
 #entry(
-  "2022 -- 2023\n#text(size: 0.8em)[part time aside studies]\n\n2021 -- 2022\n#text(size: 0.8em)[placement year]",
-  "Software Developer",
-  "Office for National Statistics",
+  [
+    2022 -- 2023#linebreak()#text(size: 0.8em)[part time aside studies]
+    2021 -- 2022#linebreak()#text(size: 0.8em)[placement year]
+  ],
+  [Software Developer],
+  [Office for National Statistics],
   [
     I joined a team working designing and developing software for processing the results of the 2021 Census. After the end of my placement I was kept on to assist with the next phase of product development and solution design. In this role I worked with sensitive data from the Census in isolated production environments and thus obtained SC clearance. Key contributions include,
     - Taking a leading role as release manager for the product and was heavily involved in requirements gathering for the new features.
@@ -172,9 +168,13 @@
 )
 
 #entry(
-  "2017 -- 2021\n#text(size: 0.8em)[Holidays & Part time]",
-  "Software Developer",
-  "Amphora",
+  [
+    2017 -- 2021
+    #linebreak()
+    #text(size: 0.8em)[Holidays & Part time]
+  ],
+  [Software Developer],
+  [Amphora],
   [
     I worked independently to explore and investigate new technologies including,
     - Creating and maintaining SAML based customer access mechanism for confidential documentation.
@@ -185,9 +185,9 @@
 )
 
 #entry(
-  "2011 — present",
-  "Ongoing Personal Projects",
-  "",
+  [2011 — present],
+  [Ongoing Personal Projects],
+  [],
   [
     My latest personal projects are focused on data analysis on different aspects of my life. This is done with a strong focus on self-hosting and privacy. Recent work includes:
     - AI based techniques for recipe extraction.
@@ -202,19 +202,19 @@
 )
 
 // Education section
-#cvsect("Education")
+== Education
 
 #entry(
-  "",
-  "MSc Mathematics and Physics (Hons) (Sandwich)",
-  "University of Bath",
+  [],
+  [MSc Mathematics and Physics (Hons) (Sandwich)],
+  [University of Bath],
   [1st Class Honours. Placement with the ONS between academic years 2 and 3.]
 )
 
 #entry(
-  "",
-  "Prior Qualifications",
-  "Reading Blue Coat School",
+  [],
+  [Prior Qualifications],
+  [Reading Blue Coat School],
   [
     4 A Levels: A\* Maths, A Further Maths, A Physics, A Chemistry
     
@@ -226,17 +226,29 @@
 #grid(
   columns: (1fr, 1fr),
   {
-    cvsect("ADDITIONAL QUALIFICATIONS AND TRAINING")
+    v(8pt)
+    box(
+      fill: sect_title_color,
+      inset: (x: 3pt, y: 2pt),
+      text(white, weight: "bold", upper("Additional Qualifications and Training"))
+    )
+    v(5pt)
     [#link("https://betterconversations.foundation/index.html")[Better Conversations] — 2022]
     linebreak()
     [ISO9001 and ISO27001 training — 2018]
   },
   {
-    cvsect("Interests")
+    v(8pt)
+    box(
+      fill: sect_title_color,
+      inset: (x: 3pt, y: 2pt),
+      text(white, weight: "bold", upper("Interests"))
+    )
+    v(5pt)
     [Long distance running; politics and governance and the applications of technology therein; previous committee member of Philosophy Society at University.]
   }
 )
 
-// References section
-#cvsect("References")
-[Available upon request]
+== References
+
+Available upon request