diff --git a/texmf/tex/latex/astron/escape.cls b/texmf/tex/latex/astron/escape.cls
index ffc68d77bf715e01cef26fe9494c565ca653e5b9..746efab9fddaf9c0b2e4264fa020072e86b2193e 100644
--- a/texmf/tex/latex/astron/escape.cls
+++ b/texmf/tex/latex/astron/escape.cls
@@ -1,5 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{escape}[ESCAPE document class]
+
 %
 % Basic project details
 %
@@ -138,41 +139,42 @@
 \renewcommand{\maketitle}{
   \thispagestyle{empty}
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 2cm)
+  \newcommand{\printLogo}{
     \begin{center}
       \includegraphics[width=6cm]{escape-logo.png}
     \end{center}
-  \end{textblock*}
-
-  \begin{textblock*}{1\textwidth}(\sideMargin, 9cm)
-    \useArial
-    \fontsize{10}{12}\selectfont
-    \renewcommand{\arraystretch}{1.5}
-    \hyphenpenalty=10000
-    \begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
-      Project Title         & \projectTitle{}\tabularnewline
-      Project Acronym       & \projectAcronym{}\tabularnewline
-      Grant Agreement No    & \grantAgreement{}\tabularnewline
-      Instrument            & \projectInstrument{}\tabularnewline
-      Topic                 & \projectTopic{}\tabularnewline
-      Start Date of Project & \projectStart{}\tabularnewline
-      Duration of Project   & \projectDuration{}\tabularnewline
-      Project Website       & \projectWeb{}\tabularnewline
-    \end{tabularx}
-    \renewcommand{\arraystretch}{1}
-  \end{textblock*}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 15.2cm)
-    \centering
-    \begin{minipage}{0.7\textwidth}
-      \centering
+  \newcommand{\projectSummary}{
+      {\useArial
+      \fontsize{10}{12}\selectfont
+      \renewcommand{\arraystretch}{1.5}
       \hyphenpenalty=10000
-      \LARGE\textbf{\docNumber{} -- \docTitle{}}
-    \end{minipage}
-  \end{textblock*}
-
-  \begin{textblock*}{1\textwidth}(\sideMargin, 17.5cm)
-    \renewcommand{\arraystretch}{1.5}
+      \begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
+        Project Title         & \projectTitle{}\tabularnewline
+        Project Acronym       & \projectAcronym{}\tabularnewline
+        Grant Agreement No    & \grantAgreement{}\tabularnewline
+        Instrument            & \projectInstrument{}\tabularnewline
+        Topic                 & \projectTopic{}\tabularnewline
+        Start Date of Project & \projectStart{}\tabularnewline
+        Duration of Project   & \projectDuration{}\tabularnewline
+        Project Website       & \projectWeb{}\tabularnewline
+      \end{tabularx}
+      \renewcommand{\arraystretch}{1}}
+  }
+
+  \newcommand{\docHeading}{
+      \begin{center}
+        \begin{minipage}{0.7\textwidth}
+          \centering
+          \hyphenpenalty=10000
+          \LARGE\textbf{\docNumber{} -- \docTitle{}}
+        \end{minipage}
+      \end{center}
+  }
+
+  \newcommand{\docDetails}{
+    {\renewcommand{\arraystretch}{1.5}
     \hyphenpenalty=10000
     \begin{tabularx}{\textwidth}{p{0.25\textwidth}X}
       Work Package                               & \workPackage{}\tabularnewline
@@ -182,10 +184,10 @@
       Date                                       & \docDate{} \tabularnewline
       Version                                    & \vcsRevision{} \tabularnewline
     \end{tabularx}
-    \renewcommand{\arraystretch}{1}
-  \end{textblock*}
+    \renewcommand{\arraystretch}{1}}
+  }
 
-  \begin{textblock*}{1\textwidth}(\sideMargin, 23.5cm)
+  \newcommand{\disseminationLevel}{
     \begin{tabular}{lll}
       \multicolumn{3}{l}{Dissemination Level}\tabularnewline
       \fbox{\pu{}} & PU: & Public\tabularnewline
@@ -193,14 +195,29 @@
       \fbox{\re{}} & RE: & Restricted to a group specified by the consortium (including the Commission)\tabularnewline
       \fbox{\co{}} & CO: & Confidential, only for members of the consortium (including the Commission)\tabularnewline
     \end{tabular}
+  }
+
+  \vspace*{-2cm}
+  \printLogo
+
+  \vspace{0.5cm}
+  \projectSummary
+
+  \vspace{0.5cm}
+  \docHeading
+
+  \vspace{0.5cm}
+  \docDetails
+
+  \begin{textblock*}{1\textwidth}(\sideMargin, 25.5cm)
+    \disseminationLevel
   \end{textblock*}
 
-  \phantom{Need some text to clear the page}
   \clearpage
 
   \changeRecord
-
   \section*{Disclaimer}
   \disclaimer{}
+
   \clearpage
 }