diff --git a/application/views/lehre/class_schedule/index.php b/application/views/lehre/class_schedule/index.php
index 82819f520..ec362123d 100644
--- a/application/views/lehre/class_schedule/index.php
+++ b/application/views/lehre/class_schedule/index.php
@@ -10,6 +10,7 @@ $includesArray = array(
 	'navigationcomponent' => true,
 	'filtercomponent' => true,
 	'vuedatepicker11' => true,
+	'momentjs2' => true,
     'customJSs' => array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
diff --git a/public/css/classScheduleOverview.css b/public/css/classScheduleOverview.css
index af279b8cb..5221b26ca 100644
--- a/public/css/classScheduleOverview.css
+++ b/public/css/classScheduleOverview.css
@@ -1,3 +1,41 @@
 html {
     font-size: .75em;
-}
\ No newline at end of file
+}
+
+nav.navbar.navbar-header,
+nav.navbar.navbar-left-side {
+    font-size: 18px
+}
+
+nav.navbar.navbar-left-side {
+        padding-top: 8px;
+    padding-bottom: 8px;
+}
+
+/* Relative sizing inside navbar */
+nav.navbar .nav-item {
+    font-size: 18px
+}
+
+nav.navbar .navbar-brand-icon {
+    font-size: 16px
+}
+
+nav.navbar .left-side-menu-link-entry {
+    font-size: 14px !important;
+}
+
+nav.navbar .nav-link {
+    font-size: 18px;
+    padding-top: 15px;
+    padding-bottom: 8px;
+}
+
+nav.navbar .dropdown-menu {
+    padding: 8px 0px;
+}
+
+nav.navbar .dropdown-item {
+    font-size: 16px;
+    padding: 4px 16px;
+}
diff --git a/public/js/components/ClassSchedule/ClassScheduleOverview.js b/public/js/components/ClassSchedule/ClassScheduleOverview.js
index 95a1db25e..50e2d3450 100644
--- a/public/js/components/ClassSchedule/ClassScheduleOverview.js
+++ b/public/js/components/ClassSchedule/ClassScheduleOverview.js
@@ -1,7 +1,6 @@
 import { CoreFilterCmpt } from "../filter/Filter.js";
 import ApiClassSchedule from "../../../js/api/factory/classSchedule.js";
 import ApiStudienSemester from "../../../js/api/factory/studiensemester.js";
-import { formatDate } from "../../helpers/DateHelpers.js";
 
 import ClassScheduleTypeModal from "./ClassScheduleTypeModal.js";
 import ClassScheduleValidityPeriodModal from "./ClassScheduleValidityPeriodModal.js";
@@ -308,10 +307,10 @@ export default {
           organizationalUnitShortCode:
             this.filterData.selectedOrganizationalUnit?.value,
           validityPeriodFrom: this.filterData.validityPeriodFrom
-            ? formatDate(this.filterData.validityPeriodFrom, "yyyy-MM-dd")
+            ? moment(this.filterData.validityPeriodFrom).format("YYYY-MM-DD")
             : null,
           validityPeriodTo: this.filterData.validityPeriodTo
-            ? formatDate(this.filterData.validityPeriodTo, "yyyy-MM-dd")
+            ? moment(this.filterData.validityPeriodTo).format("YYYY-MM-DD")
             : null,
         }),
       );
diff --git a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
index 40669f1ad..529743cd4 100644
--- a/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
+++ b/public/js/components/ClassSchedule/ClassScheduleValidityPeriodModal.js
@@ -2,7 +2,6 @@ import ApiClassSchedule from "../../../js/api/factory/classSchedule.js";
 import ApiStudienPlan from "../../../js/api/factory/studienplan.js";
 import ApiStudienSemester from "../../../js/api/factory/studiensemester.js";
 import ApiOrganizationalUnit from "../../../js/api/factory/organizationalUnit.js";
-import { formatDate } from "../../helpers/DateHelpers.js";
 
 import BsModal from "../Bootstrap/Modal.js";
 import CoreForm from "../Form/Form.js";
@@ -124,16 +123,12 @@ export default {
       if (!this.classTimeSlotValidityPeriodFormData.validityPeriodFrom)
         return null;
 
-      return formatDate(
-        this.classTimeSlotValidityPeriodFormData.validityPeriodFrom,
-      );
+      return moment(this.classTimeSlotValidityPeriodFormData.validityPeriodFrom).format("YYYY-MM-DD");
     },
     formattedValidityPeriodTo() {
       if (!this.classTimeSlotValidityPeriodFormData.validityPeriodTo)
         return null;
-      return formatDate(
-        this.classTimeSlotValidityPeriodFormData.validityPeriodTo,
-      );
+      return moment(this.classTimeSlotValidityPeriodFormData.validityPeriodTo).format("YYYY-MM-DD");
     },
     userLanguage() {
       return Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.user_language);