diff --git a/AUThReport.cls b/AUThReport.cls
index d93deb4..77a1e4a 100644
--- a/AUThReport.cls
+++ b/AUThReport.cls
@@ -108,6 +108,7 @@
 \RequirePackage{fancyhdr}
 
 \RequirePackage{graphicx}   % Figures
+\RequirePackage{wrapfig}
 \RequirePackage{tikz}
 
 % Format packages
@@ -199,8 +200,8 @@
 % 	Foot skip:        15mm
 % 	Left margin:      15mm
 % 	Right margin:     12mm
-\newcommand{\authTopMargin}{12mm}
-\newcommand{\authBottomMargin}{12mm}
+\newcommand{\authTopMargin}{10mm}
+\newcommand{\authBottomMargin}{10mm}
 \newcommand{\authHeadHeight}{10mm}
 \newcommand{\authFootSkip}{10mm}
 \newcommand{\authLeftMargin}{15mm}
@@ -342,7 +343,8 @@
     \titleformat{\subsubsection}[block]{\normalsize}{\thesubsubsection.}{1em}{}
 
     %\setlist[itemize]{noitemsep}        % Make itemize lists more compact
-    \setlist[itemize]{topsep=6pt, partopsep=0pt, itemsep=3pt, parsep=3pt}
+    \setlist[itemize]{topsep=2pt, partopsep=0pt, itemsep=1pt, parsep=1pt}
+    \setlist[enumerate]{topsep=2pt, partopsep=0pt, itemsep=1pt, parsep=1pt}
 
     % Set paragraph identation and skip
     \setlength{\parindent}{0pt}
@@ -526,14 +528,14 @@
         \fi
         % Titles
         \center
-        \textbf{}                            \\[1cm]   % vertical space
+        \textbf{}                            \\[1cm]     % vertical space
         \textsc{\Large \auth@department}     \\[0.5cm]   % Department
         \textsc{\Large \auth@className}      \\[4.0cm]   % Class/Course name
-        \begin{flushleft}
-            {\huge \bfseries \auth@docTitle}     \\[0.4cm]   % Document/Assignement Title
-            {\LARGE \bfseries \auth@docSubTitle} \\[0.1cm]   % Document/Assignement Sub-Title
-            \Hrule{0.2mm}                            \\          % -------
-        \end{flushleft}
+        {\huge \bfseries \auth@docTitle}     \\[0.3cm]   % Document/Assignement Title
+        \ifdefined \auth@docSubTitle
+            {\Large \bfseries \auth@docSubTitle} \\      % Document/Assignement Sub-Title
+        \fi
+       %\Hrule{0.2mm}                                    % -------
 
         \vfill
         % Authors-Instructors
@@ -558,7 +560,9 @@
         \textsc{\Large \auth@department}     \\[0.4cm]   % Department
         \textsc{\Large \auth@className}      \\[0.8cm]   % Class/Course name
         {\Large \bfseries \auth@docTitle}    \\[0.2cm]   % Document/Assignement Title
-        {\large \bfseries \auth@docSubTitle} \\[0.2cm]   % Document/Assignement Sub-Title
+        \ifdefined \auth@docSubTitle
+            {\large \bfseries \auth@docSubTitle} \\[0.2cm]   % Document/Assignement Sub-Title
+        \fi
         {\large \auth@date}                  \\[0.4cm]   % date
         % Authors-Instructors
         \authInsertAuthsInstructors