diff --git a/AUTHReport.cls b/AUTHReport.cls
index a5d5055..888644b 100644
--- a/AUTHReport.cls
+++ b/AUTHReport.cls
@@ -192,6 +192,54 @@
 
 }
 
+
+% Setup theme
+% =====================================================
+
+\AtBeginDocument{%
+    % Page layout (check above for the geometry setup)
+    \authSetPageLayout
+
+    % Fonts
+    \authFontEnvSetup{CMU Serif}{CMU Sans Serif}{Courier New}
+
+    % Header - Footer
+  	\pagestyle{plain}
+    \thispagestyle{authTitlePageStyle}
+
+    % Page styles and formating
+    \authPageStyle
+
+    \normalsize
+} % End \AtBeginDocument
+
+
+
+% QA document public environments/commands
+% =====================================================
+
+% Common fields
+% =====================================================
+\newcommand*{\AuthorName}[1]{\def\auth@authorName{#1}}
+\newcommand*{\AuthorMail}[1]{\def\auth@authorMail{#1}}
+\newcommand*{\AuthorAEM}[1]{\def\auth@authorAEM{#1}}
+
+\newcommand*{\CoAuthorName}[1]{\def\auth@coauthorName{#1}}
+\newcommand*{\CoAuthorMail}[1]{\def\auth@coauthorMail{#1}}
+\newcommand*{\CoAuthorAEM}[1]{\def\auth@coauthorAEM{#1}}
+
+\newcommand*{\WorkGroup}[1]{\def\auth@workGroup{#1}}
+
+\newcommand*{\DocTitle}[1]{\def\auth@docTitle{#1}}
+\newcommand*{\Department}[1]{\def\auth@department{#1}}
+\newcommand*{\ClassName}[1]{\def\auth@className{#1}}
+
+\newcommand*{\InstructorName}[1]{\def\auth@instructorName{#1}}
+\newcommand*{\InstructorMail}[1]{\def\auth@instructorMail{#1}}
+\newcommand*{\CurrentDate}[1]{\def\auth@date{#1}}
+
+
+
 % \FirstPage
 \newcommand{\authTitlePage}{%
     \begin{titlepage}
@@ -216,18 +264,18 @@
                 \large
                 \ifdefined \auth@workGroup \emph{\textsc{\auth@workGroup}} \\[2ex]\fi
                 \ifnum \isequal{\auth@coauthor}{yes}=0
-                    \emph{Συντάκτες:}
+                \emph{Συντάκτες:}
                 \else
-                    \emph{Συντάκτης:}
+                \emph{Συντάκτης:}
                 \fi  \\
                 \textsc{\auth@authorName}     \\
                 \textsc{AEM:\auth@authorAEM}  \\[1ex]
                 \normalsize	\href{mailto:\auth@authorMail}{\auth@authorMail}  \\[2ex]
                 \large
                 \ifnum \isequal{\auth@coauthor}{yes}=0
-                    \textsc{\auth@coauthorName}    \\
-                    \textsc{AEM:\auth@coauthorAEM} \\[1ex]
-                    \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}
+                \textsc{\auth@coauthorName}    \\
+                \textsc{AEM:\auth@coauthorAEM} \\[1ex]
+                \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}
                 \fi
             \end{flushleft}
         \end{minipage}
@@ -264,18 +312,18 @@
             \begin{flushleft}
                 \large
                 \ifnum \isequal{\auth@coauthor}{yes}=0
-                    \emph{Συντάκτες:}
+                \emph{Συντάκτες:}
                 \else
-                    \emph{Συντάκτης:}
+                \emph{Συντάκτης:}
                 \fi  \\
                 \textsc{\auth@authorName}     \\
                 \textsc{AEM:\auth@authorAEM}  \\[1ex]
                 \normalsize	\href{mailto:\auth@authorMail}{\auth@authorMail}  \\[2ex]
                 \large
                 \ifnum \isequal{\auth@coauthor}{yes}=0
-                    \textsc{\auth@coauthorName}    \\
-                    \textsc{AEM:\auth@coauthorAEM} \\[1ex]
-                    \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}
+                \textsc{\auth@coauthorName}    \\
+                \textsc{AEM:\auth@coauthorAEM} \\[1ex]
+                \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}
                 \fi
             \end{flushleft}
         \end{minipage}
@@ -290,56 +338,6 @@
     \end{center}
 }
 
-
-
-
-
-% Setup theme
-% =====================================================
-
-\AtBeginDocument{%
-    % Page layout (check above for the geometry setup)
-    \authSetPageLayout
-
-    % Fonts
-    \authFontEnvSetup{CMU Serif}{CMU Sans Serif}{Courier New}
-
-    % Header - Footer
-  	\pagestyle{plain}
-    \thispagestyle{authTitlePageStyle}
-
-    % Page styles and formating
-    \authPageStyle
-
-    \normalsize
-} % End \AtBeginDocument
-
-
-
-% QA document public environments/commands
-% =====================================================
-
-% Common fields
-% =====================================================
-\newcommand*{\AuthorName}[1]{\def\auth@authorName{#1}}
-\newcommand*{\AuthorMail}[1]{\def\auth@authorMail{#1}}
-\newcommand*{\AuthorAEM}[1]{\def\auth@authorAEM{#1}}
-
-\newcommand*{\CoAuthorName}[1]{\def\auth@coauthorName{#1}}
-\newcommand*{\CoAuthorMail}[1]{\def\auth@coauthorMail{#1}}
-\newcommand*{\CoAuthorAEM}[1]{\def\auth@coauthorAEM{#1}}
-
-\newcommand*{\WorkGroup}[1]{\def\auth@workGroup{#1}}
-
-\newcommand*{\DocTitle}[1]{\def\auth@docTitle{#1}}
-\newcommand*{\Department}[1]{\def\auth@department{#1}}
-\newcommand*{\ClassName}[1]{\def\auth@className{#1}}
-
-\newcommand*{\InstructorName}[1]{\def\auth@instructorName{#1}}
-\newcommand*{\InstructorMail}[1]{\def\auth@instructorMail{#1}}
-\newcommand*{\CurrentDate}[1]{\def\auth@date{#1}}
-
-
 \newcommand{\Title}{%
     \ifnum \isequal{\auth@short}{no}=0
         \authTitlePage