diff --git a/lib/widgets/sleep_form.dart b/lib/widgets/sleep_form.dart
index 4a21672..fd4ada5 100644
--- a/lib/widgets/sleep_form.dart
+++ b/lib/widgets/sleep_form.dart
@@ -25,7 +25,8 @@ class _SleepFormState extends State<SleepForm> {
 
   void submitForm() {
     if (_sleepFormKey.currentState!.validate()) {
-      _sleepFormKey.currentState?.save();
+      _sleepFormKey.currentState?.save(); //call every onSave Method
+      //TODO Businesslogik aufrufen!
       print(_textInput);
       print(slider.getSliderValue());
       print('Eingeschlafen um: ${sleepTimePicker.getCurrentTime}');
diff --git a/lib/widgets/timepicker.dart b/lib/widgets/timepicker.dart
index ce93bfb..8e61321 100644
--- a/lib/widgets/timepicker.dart
+++ b/lib/widgets/timepicker.dart
@@ -43,6 +43,36 @@ class TimePickerState extends State<TimePicker> {
               });
             },
             child: const Text('Zeit einstellen'))
+          widget.descriptionText,
+          style: const TextStyle(fontSize: 12),
+        ),
+        Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+          Text(
+            '${widget._initialTime.hour.toString().padLeft(2, '0')}:${widget._initialTime.minute.toString().padLeft(2, '0')}',
+            style: const TextStyle(fontSize: 22),
+          ),
+          const SizedBox(width: 16),
+          ElevatedButton(
+              onPressed: () async {
+                //TODO auslagern
+                TimeOfDay? newTime = await showTimePicker(
+                  context: context,
+                  initialTime: widget._initialTime,
+                  builder: (context, child) {
+                    return MediaQuery(
+                      data: MediaQuery.of(context)
+                          .copyWith(alwaysUse24HourFormat: true),
+                      child: child!,
+                    );
+                  },
+                );
+                if (newTime == null) return;
+                setState(() {
+                  widget._initialTime = newTime;
+                });
+              },
+              child: const Text('Zeit einstellen'))
+        ])
       ]),
     );
   }