diff --git a/AUTHReport.cls b/AUTHReport.cls
index e94a669..9021a2c 100644
--- a/AUTHReport.cls
+++ b/AUTHReport.cls
@@ -16,12 +16,12 @@
 \DeclareOption{short}{\def\auth@short{yes}}
 
 % Declare option for CoAuthor
-\DeclareOption{coauthor}{\def\auth@coauthor{yes}}
+%\DeclareOption{coauthor}{\def\auth@coauthor{yes}}
 
 
 % Default option values
 \def\auth@short{no}
-\def\auth@coauthor{no}
+%\def\auth@coauthor{no}
 
 % Pass all other options to article
 \DeclareOption*{%
@@ -184,11 +184,12 @@
     \titleformat{\subsection}[block]{\large}{\thesubsection.}{1em}{}
     \titleformat{\subsubsection}[block]{\normalsize}{\thesubsubsection.}{1em}{}
 
-    \setlist[itemize]{noitemsep}        % Make itemize lists more compact
+    %\setlist[itemize]{noitemsep}        % Make itemize lists more compact
+    \setlist[itemize]{topsep=6pt, partopsep=0pt, itemsep=3pt, parsep=3pt}
 
     % Set paragraph identation and skip
     \setlength{\parindent}{0pt}
-    \setlength{\parskip}{0.65em}
+    \setlength{\parskip}{0.3em}
 
 }
 
@@ -196,6 +197,14 @@
 % Setup theme
 % =====================================================
 
+\hypersetup{
+    colorlinks=true,
+    linkcolor=red,   % Internal links, those generated by cross-referenced elements
+    filecolor=blue,  % Links to local files
+    urlcolor=blue    % Links to web sites
+}
+\setlist[itemize]{topsep=0pt, partopsep=0pt, itemsep=3pt, parsep=3pt}
+
 \AtBeginDocument{%
     % Page layout (check above for the geometry setup)
     \authSetPageLayout
@@ -237,6 +246,9 @@
 
 \newcommand*{\InstructorName}[1]{\def\auth@instructorName{#1}}
 \newcommand*{\InstructorMail}[1]{\def\auth@instructorMail{#1}}
+\newcommand*{\CoInstructorName}[1]{\def\auth@coinstructorName{#1}}
+\newcommand*{\CoInstructorMail}[1]{\def\auth@coinstructorMail{#1}}
+
 \newcommand*{\CurrentDate}[1]{\def\auth@date{#1}}
 
 
@@ -265,30 +277,39 @@
             \begin{flushleft}
                 \large
                 \ifdefined \auth@workGroup \emph{\textsc{\auth@workGroup}} \\[2ex]\fi
-                \ifnum \isequal{\auth@coauthor}{yes}=0
-                \emph{Συντάκτες:}
+                \ifdefined \auth@coauthorName
+                    \emph{Συντάκτες:}
                 \else
-                \emph{Συντάκτης:}
+                    \emph{Συντάκτης:}
                 \fi  \\
                 \textsc{\auth@authorName}     \\
-                \textsc{AEM:\auth@authorAEM}  \\[1ex]
+                \textsc{AEM:\auth@authorAEM}  \\[0.35ex]
                 \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}
+                \ifdefined \auth@coauthorName
+                    \textsc{\auth@coauthorName}    \\
+                    \textsc{AEM:\auth@coauthorAEM} \\[0.35ex]
+                    \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}  \\[2ex]
                 \fi
             \end{flushleft}
         \end{minipage}
         \begin{minipage}{0.4\textwidth}
-            \begin{flushright} \large
-                \emph{Διδάσκων:}              \\  % Instructor
-                \textsc{\auth@instructorName} \\[1ex]
-                \normalsize
-                \href{mailto:\auth@instructorMail}{\auth@instructorMail}
+            \begin{flushright}
+                \large
+                \ifdefined \auth@coinstructorName % Instructor(s)
+                    \emph{Διδάσκοντες:}
+                \else
+                    \emph{Διδάσκων:}
+                \fi  \\
+                \textsc{\auth@instructorName} \\[0.35ex]
+                \normalsize \href{mailto:\auth@instructorMail}{\auth@instructorMail}  \\[2ex]
+                \large
+                \ifdefined \auth@coinstructorName
+                    \textsc{\auth@coinstructorName} \\[0.35ex]
+                    \normalsize \href{mailto:\auth@coinstructorMail}{\auth@coinstructorMail}  \\[2ex]
+                \fi
             \end{flushright}
-        \end{minipage}       \\
+        \end{minipage}
         \vfill
         {\large \auth@date}  \\ % date
 
@@ -314,28 +335,37 @@
         \begin{minipage}{0.4\textwidth}
             \begin{flushleft}
                 \large
-                \ifnum \isequal{\auth@coauthor}{yes}=0
-                \emph{Συντάκτες:}
+                \ifdefined \auth@coauthorName
+                    \emph{Συντάκτες:}
                 \else
-                \emph{Συντάκτης:}
+                    \emph{Συντάκτης:}
                 \fi  \\
                 \textsc{\auth@authorName}     \\
-                \textsc{AEM:\auth@authorAEM}  \\[1ex]
+                \textsc{AEM:\auth@authorAEM}  \\[0.35ex]
                 \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}
+                \ifdefined \auth@coauthorName
+                    \textsc{\auth@coauthorName}    \\
+                    \textsc{AEM:\auth@coauthorAEM} \\[0.35ex]
+                    \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}  \\[2ex]
                 \fi
             \end{flushleft}
         \end{minipage}
         \begin{minipage}{0.4\textwidth}
             \begin{flushright} \large
-                \emph{Διδάσκων:}         \\  % Instructor
-                \textsc{\auth@instructorName} \\[1ex]
-                \normalsize
-                \href{mailto:\auth@instructorMail}{\auth@instructorMail}
+                \large
+                \ifdefined \auth@coinstructorName % Instructor(s)
+                    \emph{Διδάσκοντες:}
+                \else
+                    \emph{Διδάσκων:}
+                \fi  \\
+                \textsc{\auth@instructorName} \\[0.35ex]
+                \normalsize \href{mailto:\auth@instructorMail}{\auth@instructorMail} \\[2ex]
+                \large
+                    \ifdefined \auth@coinstructorName
+                    \textsc{\auth@coinstructorName} \\[0.35ex]
+                    \normalsize \href{mailto:\auth@coinstructorMail}{\auth@coinstructorMail} \\[2ex]
+                \fi
             \end{flushright}
         \end{minipage}
     \end{center}
@@ -349,20 +379,21 @@
     \fi
 }
 
-% \InsertFigure{}{}{}{}
-% [1]: scale
-% [2]: Label
-% [3]: Figure file
-% [4]: Caption text
-% example: \InsertFigure{0.8}{fig:lala}{lala.png}{\eng{Makes lala}}
-\newcommand{\InsertFigure}[4]{
-    \begin{figure*}[h!]
+% \InsertFigure{}{}{}{}{}
+% [1]: Position specifier
+% [2]: scale
+% [3]: Label
+% [4]: Figure file
+% [5]: Caption text
+% example: \InsertFigure{!h}{0.8}{fig:lala}{lala.png}{\eng{Makes lala}}
+\newcommand{\InsertFigure}[5]{
+    \begin{figure}[#1]
         \captionsetup{format=plain}
         \centering
-        \includegraphics[width=#1\textwidth]{#3}
-        \caption{#4}
-        \label{#2}
-    \end{figure*}
+        \includegraphics[width=#2\textwidth]{#4}
+        \caption{#5}
+        \label{#3}
+    \end{figure}
 }
 
 % \WrapFigure{}{}{}{}