diff --git a/lib/screen/pages/timetable/timetable.dart b/lib/screen/pages/timetable/timetable.dart
index 1dcdc5e..0fe7a05 100644
--- a/lib/screen/pages/timetable/timetable.dart
+++ b/lib/screen/pages/timetable/timetable.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:marianum_mobile/screen/pages/timetable/appointmenetComponent.dart';
 import 'package:marianum_mobile/screen/pages/timetable/timeRegionComponent.dart';
 import 'package:marianum_mobile/screen/pages/timetable/timetableEvents.dart';
+import 'package:marianum_mobile/widget/errorView.dart';
 import 'package:provider/provider.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
@@ -48,9 +49,9 @@ class _TimetableState extends State<Timetable> {
           IconButton(
             icon: const Icon(Icons.today),
             onPressed: () {
-              controller.displayDate = DateTime.now().jumpToNextWeekDay(DateTime.monday);
-              //controller.displayDate = DateTime.now().add(Duration(days: 2));
-              //controller.selectedDate = DateTime.now();
+              // controller.displayDate = DateTime.now().jumpToNextWeekDay(DateTime.monday);
+              // controller.displayDate = DateTime.now().add(Duration(days: 2));
+              controller.displayDate = DateTime.now();
             }
           ),
         ],
@@ -62,14 +63,10 @@ class _TimetableState extends State<Timetable> {
           GetHolidaysResponse holidays = value.getHolidaysResponse;
 
           if(value.hasError) {
-            WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-              showDialog(context: context, builder: (context) {
-                return AlertDialog(
-                  title: Text("Webuntis error"),
-                  content: Text(value.error.toString()),
-                );
-              });
-            });
+            return ErrorView(
+              icon: Icons.calendar_month,
+              text: "Webuntis error: ${value.error.toString()}",
+            );
           }
 
           return GestureDetector(