diff --git a/latex/main.tex b/latex/main.tex
index 5bc8fcc..161ee4e 100644
--- a/latex/main.tex
+++ b/latex/main.tex
@@ -25,6 +25,7 @@
 \begin{document}
 \frontmatter
 % \maketitle
+\onehalfspacing
 \include{frontmatter/maketitle}
 \include{frontmatter/maketitle_secondary}
 \include{frontmatter/approval}
@@ -42,6 +43,7 @@
 % \pagestyle{fancyplain}
 \mainmatter
 % Include content
+\onehalfspacing
 \include{chapters/id/01_introduction}
 \include{chapters/id/02_literature_review/index}
 \include{chapters/id/03_methodology/index}
diff --git a/latex/thesis.cls b/latex/thesis.cls
index 80ec0d4..e8b80c0 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -93,7 +93,6 @@
 \geometry{left=4cm, top=3cm, right=3cm, bottom=3cm}
 \setlength{\parskip}{0.5em}
 % \setlength{\parindent}{0pt}
-\onehalfspacing
 
 % Fonts
 \defaultfontfeatures{Ligatures=TeX}
@@ -209,7 +208,7 @@
 \setlength{\cftchapnumwidth}{3.5em}
 \setlength{\cftsecnumwidth}{2em}
 \setlength{\cftsubsecnumwidth}{2.5em}
-\setlength{\cftfignumwidth}{5em}
+\setlength{\cftfignumwidth}{6em}
 \setlength{\cfttabnumwidth}{4em}
 \renewcommand \cftchapdotsep{1} % https://tex.stackexchange.com/a/273764
 \renewcommand \cftsecdotsep{1} % https://tex.stackexchange.com/a/273764