diff --git a/content.yml b/content.yml
index a21ace9..a8e8c04 100644
--- a/content.yml
+++ b/content.yml
@@ -50,5 +50,5 @@ education:
 mainfont: Hoefler Text
 fontsize: 10pt
 lang: English
-geometry: a4paper, textwidth=5.5in, textheight=8.5in, marginparsep=7pt, marginparwidth=.6in
+geometry: a4paper, left=35mm, right=35mm, top=51mm, bottom=17mm
 ---
diff --git a/template.tex b/template.tex
index ad7fbd1..6375788 100644
--- a/template.tex
+++ b/template.tex
@@ -65,7 +65,9 @@ $endif$
 
 {\LARGE $name$}\\[.2cm]
 
+$if(urls)$
 \begin{multicols}{2}
+$endif$
 
 $for(address)$
 $address$\\
@@ -76,26 +78,35 @@ $endfor$
 $phone$\\
 \href{mailto:$email$}{$email$}\\
 
+
+$if(urls)$
 \columnbreak
 
 $for(urls)$
 \href{http://$urls$}{$urls$}\\
 $endfor$
 \end{multicols}
+$endif$
 
-% \vfill
+\vspace{30pt}
 
+$if(intro)$
 $intro$
+$endif$
 
-\subsection*{Areas of Interest}
+% \subsection*{Areas of Interest}
+$if(skills)$
 \begin{itemize}
-$for(skills)$
-\item $skills$
-$endfor$
+    $for(skills)$
+      \item $skills$
+    $endfor$
 \end{itemize}
+$endif$
 
 % \vfill
 
+\vspace{25pt}
+
 \section*{Previous Experience}
 \noindent
 $for(experience)$
@@ -104,12 +115,14 @@ $for(experience)$
 $experience.city$\\[.2cm]
 $endfor$
 
+$if(education)$
 \section*{Education}
 \noindent
 $for(education)$
 \note{$education.year$}\textbf{$education.subject$}$if(education.degree)$, $education.degree$$endif$\\
 \emph{$education.institute$}$if(education.city)$, $education.city$$endif$\\[.2cm]
 $endfor$
+$endif$
 
 $if(languages)$
 \section*{Languages}