diff --git a/build/main.pdf b/build/main.pdf
index 3ab2c55..a448fe1 100644
Binary files a/build/main.pdf and b/build/main.pdf differ
diff --git a/main.tex b/main.tex
index 49c3b57..76cc5fb 100644
--- a/main.tex
+++ b/main.tex
@@ -1,7 +1,7 @@
 \RequirePackage[l2tabu, orthodox]{nag}
 
 % TODO: decide if one-sided/two-sided
-%\documentclass[headsepline,footsepline,footinclude=false,fontsize=11pt,paper=a4,listof=totoc,bibliography=totoc,BCOR=12mm,DIV=calc} % two-sided
+%\documentclass[headsepline,footsepline,footinclude=false,fontsize=11pt,paper=a4,listof=totoc,bibliography=totoc,BCOR=12mm,DIV=12]{scrbook} % two-sided
 \documentclass[headsepline,footsepline,footinclude=false,oneside,fontsize=11pt,paper=a4,listof=totoc,bibliography=totoc]{scrbook} % one-sided
 
 \input{settings/packages}
diff --git a/pages/cover.tex b/pages/cover.tex
index cd0d024..88e2140 100644
--- a/pages/cover.tex
+++ b/pages/cover.tex
@@ -5,9 +5,9 @@
   \includegraphics[width=40mm]{logos/tum}
 
   \vspace{5mm}
-  \Huge \textsc{\getFaculty{}}\\
+  {\huge\MakeUppercase{\getFaculty{}}}\\
   \vspace{5mm}
-  \Large \textsc{Technische Universität München}\\
+  {\large\MakeUppercase{\getUniversity{}}}\\
   \vspace{1mm}
 \end{center}
 
diff --git a/pages/disclaimer.tex b/pages/disclaimer.tex
index b1fcd6a..bac7fae 100644
--- a/pages/disclaimer.tex
+++ b/pages/disclaimer.tex
@@ -5,6 +5,6 @@ I assure the single handed composition of this \MakeLowercase{\getDoctype{}} onl
 
 \vspace{15mm}
 \noindent
-Munich, \getSubmissionDate{} \hspace{5cm} \getAuthor{}
+\getSubmissionLocation{}, \getSubmissionDate{} \hspace{5cm} \getAuthor{}
 
 \cleardoublepage{}
diff --git a/pages/title.tex b/pages/title.tex
index 620fa69..6dc44cd 100644
--- a/pages/title.tex
+++ b/pages/title.tex
@@ -5,9 +5,9 @@
   \includegraphics[width=40mm]{logos/tum}
 
   \vspace{5mm}
-  \Huge \textsc{\getFaculty{}}\\
+  {\huge\MakeUppercase{\getFaculty{}}}\\
   \vspace{5mm}
-  \Large \textsc{Technische Universität München}\\
+  {\large\MakeUppercase{\getUniversity{}}}\\
   \vspace{1mm}
 \end{center}
 
diff --git a/settings/commands.tex b/settings/commands.tex
index db649e3..958f7ea 100644
--- a/settings/commands.tex
+++ b/settings/commands.tex
@@ -1,4 +1,5 @@
 % Basic information for cover & title page
+\newcommand*{\getUniversity}{Technische Universität München}
 \newcommand*{\getFaculty}{Fakultät für Informatik}
 \newcommand*{\getTitle}{TODO: Thesis title}
 \newcommand*{\getTitleGer}{TODO: Titel der Abschlussarbeit}
@@ -7,5 +8,6 @@
 \newcommand*{\getSupervisor}{TODO: Supervisor}
 \newcommand*{\getAdvisor}{TODO: Advisor}
 \newcommand*{\getSubmissionDate}{TODO: Submission date}
+\newcommand*{\getSubmissionLocation}{Munich}
 
 % TODO: add custom commands etc.