diff --git a/template.tex b/template.tex
index 11dbbf4..a296a65 100644
--- a/template.tex
+++ b/template.tex
@@ -102,11 +102,15 @@ $endfor$
 \section*{Education}
 \noindent
 $for(education)$
-\note{$education.year$}$education.degree$\\
+\note{$education.year$}\textbf{$education.subject$}$if(education.degree)$, $education.degree$$endif$\\
 \emph{$education.institute$}$if(education.city)$, $education.city$$endif$\\[.2cm]
-
 $endfor$
 
-\vfill{}
+$if(languages)$
+\section*{Languages}
+$for(languages)$
+\emph{$languages.language$} ($languages.proficiency$)\\
+$endfor$
+$endif$
 
 \end{document}