diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java
index 64c6e2b..f98ffd7 100644
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -13,7 +13,7 @@ import res.Event;
 public class CreateEventController {
 
     @FXML
-    public GridPane grid;
+    public GridPane mainGrid;
     @FXML
     public DatePicker datePickerDate;
     @FXML
@@ -42,12 +42,14 @@ public class CreateEventController {
         JFXTimePicker timePickerStart = new JFXTimePicker();
         timeStart = timePickerStart;
         timePickerStart.set24HourView(true);
-        grid.add(timePickerStart, 1 , 3);
+        timePickerStart.getStyleClass().add("timePicker");
+        mainGrid.add(timePickerStart, 1 , 3);
 
         JFXTimePicker timePickerEnd = new JFXTimePicker();
         timeEnd = timePickerEnd;
         timePickerEnd.set24HourView(true);
-        grid.add(timePickerEnd, 1 , 4);
+        timePickerEnd.getStyleClass().add("timePicker");
+        mainGrid.add(timePickerEnd, 1 , 4);
     }
 
 
diff --git a/client/app/src/main/resources/main/create-event.fxml b/client/app/src/main/resources/main/create-event.fxml
index c56066c..e25fcdd 100644
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/client/app/src/main/resources/main/create-event.fxml
@@ -5,7 +5,7 @@
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.CreateEventController">
 
     <columnConstraints>
@@ -39,8 +39,6 @@
 
     <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="400" minWidth="400"/>
     <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
     <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
         <items>