diff --git a/controllers/timetable.go b/controllers/timetable.go
index b1d5eb1..58267dd 100644
--- a/controllers/timetable.go
+++ b/controllers/timetable.go
@@ -55,9 +55,9 @@ func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.Of
 		for minute := 0; minute < 60; minute += b.config.Date.MinuteGranularity {
 			tableBody += "<tr>"
 			if minute == 0 {
-				tableBody += fmt.Sprintf("<td>%d Uhr</td>\n", hour)
+				tableBody += fmt.Sprintf("<td class=\"timetableRightBorder\">%d Uhr</td>\n", hour)
 			} else {
-				tableBody += "<td></td>\n"
+				tableBody += "<td class=\"timetableRightBorder\"></td>\n"
 			}
 			for day := 0; day < 5; day += 1 {
 				for slot := 0; slot < slots[day]; slot += 1 {
@@ -96,7 +96,7 @@ func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.Of
 						}
 					} else {
 						if slot+1 == slots[day] {
-							tableBody += "<td style=\"border-right: 1px dotted\"></td>\n"
+							tableBody += "<td class=\"timetableRightBorder\"></td>\n"
 						} else {
 							tableBody += "<td></td>\n"
 						}
diff --git a/static/officeHours.css b/static/officeHours.css
new file mode 100644
index 0000000..3945a59
--- /dev/null
+++ b/static/officeHours.css
@@ -0,0 +1,17 @@
+/* mark required fields */
+input.required ~ label::after, select.required ~ label::after {
+	content: ' *';
+    color: red;
+}
+/* improve indent of help texts below form fields */
+.form-control ~ .form-text {
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+.timetableRightBorder {
+	border-right: 1px dotted;
+}
+td.officeHour {
+	border: 1px solid;
+}
diff --git a/templating/templates/addMask.html b/templating/templates/addMask.html
index 2e55602..00a9d6b 100644
--- a/templating/templates/addMask.html
+++ b/templating/templates/addMask.html
@@ -14,17 +14,6 @@
   {{end}}
 </div>
 
-<style>
-  input.required ~ label::after, select.required ~ label::after {
-    content: ' *';
-    color: red;
-  }
-
-  .form-control ~ .form-text {
-    padding-left: 12px;
-    padding-right: 12px;
-  }
-</style>
 <div class="row">
   <div class="col-lg-8 mb-4">
     <form method="POST" action="addOfficeHour">
diff --git a/templating/templates/base.html b/templating/templates/base.html
index 411898c..93aba65 100644
--- a/templating/templates/base.html
+++ b/templating/templates/base.html
@@ -6,7 +6,8 @@
   <meta name="description" content="Eine Übersicht der Sprechstunden, die in den offenen Arbeitsräumen der Fachschaft Mathematik, TU Darmstadt, angeboten werden">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" href="/static/officeHours.css" />
 
   <title>{{block "title" .}}Start{{end}} – Sprechstunden</title>
 </head>
diff --git a/templating/templates/officeHourTable.html b/templating/templates/officeHourTable.html
index 72e86ed..620b38e 100644
--- a/templating/templates/officeHourTable.html
+++ b/templating/templates/officeHourTable.html
@@ -1,11 +1,11 @@
 <table>
   <tr>
-    <th>&nbsp;</th>
-    <th colspan="{{.ColspanMon}}" style="padding-left: 10px; padding-right: 10px; border-right: 1px dotted">Montag</th>
-    <th colspan="{{.ColspanTue}}" style="padding-left: 10px; padding-right: 10px; border-right: 1px dotted">Dienstag</th>
-    <th colspan="{{.ColspanWed}}" style="padding-left: 10px; padding-right: 10px; border-right: 1px dotted">Mittwoch</th>
-    <th colspan="{{.ColspanThu}}" style="padding-left: 10px; padding-right: 10px; border-right: 1px dotted">Donnerstag</th>
-    <th colspan="{{.ColspanFri}}" style="padding-left: 10px; padding-right: 10px; border-right: 1px dotted">Freitag</th>
+    <th class="px-2 text-center timetableRightBorder">&nbsp;</th>
+    <th class="px-2 text-center timetableRightBorder" colspan="{{.ColspanMon}}">Montag</th>
+    <th class="px-2 text-center timetableRightBorder" colspan="{{.ColspanTue}}">Dienstag</th>
+    <th class="px-2 text-center timetableRightBorder" colspan="{{.ColspanWed}}">Mittwoch</th>
+    <th class="px-2 text-center timetableRightBorder" colspan="{{.ColspanThu}}">Donnerstag</th>
+    <th class="px-2 text-center timetableRightBorder" colspan="{{.ColspanFri}}">Freitag</th>
   </tr>
   {{.TableBody}}
-</table>
\ No newline at end of file
+</table>
diff --git a/templating/templates/td.html b/templating/templates/td.html
index e9c79ce..89df7de 100644
--- a/templating/templates/td.html
+++ b/templating/templates/td.html
@@ -1,4 +1,4 @@
-<td rowspan="{{divide .OfficeHour.Duration .MinuteGranularity}}" style="border: 1px solid">
+<td class="officeHour" rowspan="{{divide .OfficeHour.Duration .MinuteGranularity}}">
   {{if .DeleteIcons}}<div style="text-align: right;"><a href="/deleteOfficeHour?id={{.OfficeHour.Id}}">❌</a></div>{{end}}
   {{printf "%02d" .OfficeHour.Date.Hour}}:{{printf "%02d" .OfficeHour.Date.Minute}} - {{printf "%02d" .OfficeHour.EndDate.Hour}}:{{printf "%02d" .OfficeHour.EndDate.Minute}}<br>
   {{if eq .OfficeHour.Date.Week 1}}in ungeraden Vorlesungswochen<br>{{end}}{{if eq .OfficeHour.Date.Week 2}}in geraden Vorlesungswochen<br>{{end}}