diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml
index 7017cd2..af0d08c 100644
--- a/hellofx/app/src/main/resources/client/main-view.fxml
+++ b/hellofx/app/src/main/resources/client/main-view.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
+<GridPane  style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
     <columnConstraints>
         <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
         <ColumnConstraints hgrow="ALWAYS" />
@@ -27,91 +27,78 @@
             ADD
         </Button>
     </VBox>
-    <GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
+    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-            <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+        <ColumnConstraints hgrow="ALWAYS" />
+         <ColumnConstraints />
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
-            <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
-            <RowConstraints vgrow="ALWAYS" />
+            <RowConstraints />
+            <RowConstraints vgrow="ALWAYS"/>
         </rowConstraints>
-        <Label textFill="WHITE">
+        <Label styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
             Monat
             <padding>
                 <Insets left="5" />
             </padding>
         </Label>
 
-        <Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
-            Mo
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
-            Di
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
-            Mi
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
-            Do
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
-            Fr
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
-            Sa
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-        <Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
-            So
-            <padding>
-                <Insets left="5" />
-            </padding>
-        </Label>
-
-        <VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
-
-        </VBox>
-        <VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
-
-        </VBox>
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
+            <columnConstraints>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" maxWidth="14.2857142857" minWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
+                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
+            </rowConstraints>
+            <Label styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
+                Montag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="0">
+                Dienstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label styleClass="labelDays"  textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="0">
+                Mittwoch
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="0">
+                Donnerstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label styleClass="labelDays"  textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="0">
+                Freitag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label  styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="0">
+                Samstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="0">
+                Sonntag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+        </GridPane>
     </GridPane>
 </GridPane>
diff --git a/hellofx/app/src/main/resources/client/style.css b/hellofx/app/src/main/resources/client/style.css
index f85a748..d1350a1 100644
--- a/hellofx/app/src/main/resources/client/style.css
+++ b/hellofx/app/src/main/resources/client/style.css
@@ -8,6 +8,25 @@
 
 }
 
+.gridCalendar Line{
+    -fx-stroke: white;
+}
+
+.gridCalender{
+        -fx-min-height: 80px;
+        -fx-max-height: 80px;
+}
+
+.labelMonth{
+    -fx-font-size: 35px;
+    -fx-font-weight: bold;
+}
+
+.labelDays{
+    -fx-background-color: #525E74;
+    -fx-font-size: 30px;
+}
+
 Label{
     -fx-text-fill: white;
 }