diff --git a/resources/ormc_handout.cls b/resources/ormc_handout.cls
index 0036559..8158156 100755
--- a/resources/ormc_handout.cls
+++ b/resources/ormc_handout.cls
@@ -427,19 +427,15 @@
 		\centering
 
 		% Left and right headers (uptitle)
-		\def\uptitle{%
-			\if\@uptitlel\relax\else\textsc{\@uptitlel}\fi \hfill~%
-			\if\@uptitler\relax\else\textsc{\@uptitler}\fi \par
-		}
-		\if\@uptitlel\relax % If neither header is defined,
-		\if\@uptitlel\relax % don't insert an upper title.
-			\def\@uptitle{\relax}
-		\fi\fi\uptitle{}
+		\if\@uptitlel\relax\else\textsc{\@uptitlel}\fi \hfill\null%
+		\if\@uptitler\relax\else\textsc{\@uptitler}\fi \par
 
 		% Main title
 		\rule{\linewidth}{0.2mm} \par
-		\huge \@title \par \normalsize
-		\vspace{1ex} \@subtitle \par
+		\vspace{4mm}
+		{\huge \@title} \par
+		\vspace{2mm} \@subtitle \par
+		\vspace{1mm}
 		\rule{\linewidth}{0.2mm} \par
 
 		% Solution warning