diff --git a/latex/main.tex b/latex/main.tex
index d2be8a5..03ef04b 100644
--- a/latex/main.tex
+++ b/latex/main.tex
@@ -18,11 +18,14 @@
 \begin{document}
 
 \maketitle
+\frontmatter
+\setcounter{page}{1}
 \theendorsementpage{toc}
 \originalitystatement{toc}
 \tableofcontents
 \clearpage
-
+\mainmatter
+\pagestyle{fancyplain}
 % Include content
 \include{content/abstract}
 \include{content/introduction}
diff --git a/latex/thesis.cls b/latex/thesis.cls
index 4a6285c..cf7bbd3 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -56,11 +56,21 @@
 }
 
 % Header and footer
-\pagestyle{fancy}
-\fancyhf{}
-\fancyhead[R]{\nouppercase{\rightmark}}
-\fancyhead[L]{\nouppercase{\leftmark}}
-\fancyfoot[C]{\thepage}
+\fancypagestyle{fancy}{%
+    \fancyhf{}
+    \fancyhead[R]{\nouppercase{\rightmark}}
+    \fancyhead[L]{\nouppercase{\leftmark}}
+    \fancyfoot[C]{\thepage}
+}
+\fancypagestyle{fancyplainfrontmatter}{%
+    \renewcommand{\headrulewidth}{0pt}
+    \fancyfoot[C]{\thepage}
+}
+\fancypagestyle{fancyplain}{%
+    \fancyhf{}
+    \renewcommand{\headrulewidth}{0pt}
+    \fancyhead[R]{\thepage}
+}
 
 % Chapter formatting
 \titleformat{\chapter}[display]
@@ -112,11 +122,9 @@
 
 % Frontmatter Macro (Toggle TOC Inclusion)
 \newcommand{\frontmattersection}[3]{%
-  \begin{titlepage}
   \centering
-  \ifstrequal{#1}{toc}{\addcontentsline{toc}{chapter}{#2}}{\chapter*{#2}}%
+  \ifstrequal{#1}{toc}{\thispagestyle{fancyplainfrontmatter}\addcontentsline{toc}{chapter}{#2}}{\chapter*{#2}}%
   \input{frontmatter/#3}
-  \end{titlepage}
   \clearpage
 }