diff --git a/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java b/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java
index 50585f0..37943eb 100644
--- a/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java
+++ b/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java
@@ -1,8 +1,28 @@
 package de.hitec.nhplus.medication;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+import de.hitec.nhplus.utils.DateConverter;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+
 public class MedicationModalController {
 
+
+    private Medication medication;
+
+    private AllMedicationController controller;
+
     public void initialize(){
 
     }
+
+    @FXML
+    public void handleSave() {
+    }
+    @FXML
+    public void handleCancel() {
+    }
 }
diff --git a/src/main/resources/de/hitec/nhplus/medication/MedicationModal.fxml b/src/main/resources/de/hitec/nhplus/medication/MedicationModal.fxml
index 792550a..0538795 100644
--- a/src/main/resources/de/hitec/nhplus/medication/MedicationModal.fxml
+++ b/src/main/resources/de/hitec/nhplus/medication/MedicationModal.fxml
@@ -4,6 +4,9 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TextArea?>
 <BorderPane
     xmlns="http://javafx.com/javafx/17.0.2-ea"
     xmlns:fx="http://javafx.com/fxml/1"
@@ -12,7 +15,99 @@
     <padding>
         <Insets top="8" left="8" bottom="8" right="8"/>
     </padding>
+    <top>
+        <GridPane hgap="8.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="NEVER"/>
+                <ColumnConstraints hgrow="NEVER"/>
+                <ColumnConstraints hgrow="ALWAYS"/>
+                <ColumnConstraints hgrow="NEVER"/>
+                <ColumnConstraints hgrow="NEVER"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER"/>
+            </rowConstraints>
+
+            <!-- Row 0-->
+            <Label
+                GridPane.rowIndex="0"
+                GridPane.columnIndex="0"
+                text="Name:"
+            />
+            <TextField
+                GridPane.rowIndex="0"
+                GridPane.columnIndex="1"
+            />
+            <Label
+                GridPane.rowIndex="0"
+                GridPane.columnIndex="2"
+                text="Hersteller:"
+            />
+            <TextField
+                GridPane.rowIndex="0"
+                GridPane.columnIndex="3"
+            />
+            <!-- Row 1 -->
+            <Label
+                GridPane.rowIndex="1"
+                GridPane.columnIndex="0"
+                text="Verabreichungsmethode:"
+            />
+            <TextField
+                GridPane.rowIndex="1"
+                GridPane.columnIndex="1"
+            />
+            <Label
+                GridPane.rowIndex="1"
+                GridPane.columnIndex="2"
+                text="Lagerbestand:"
+            />
+            <TextField
+                GridPane.rowIndex="1"
+                GridPane.columnIndex="3"
+            />
+
+        </GridPane>
+    </top>
     <center>
-        <Label text="Test"/>
+        <BorderPane>
+            <padding>
+                <Insets top="8" left="8" bottom="8" right="8"/>
+            </padding>
+            <left>
+                <BorderPane>
+                    <top>
+                        <Label text="Inhaltsstoffe:"/>
+                    </top>
+                </BorderPane>
+            </left>
+            <center>
+                <TextArea/>
+            </center>
+        </BorderPane>
     </center>
+    <bottom>
+        <BorderPane>
+            <right>
+                <HBox spacing="8.0">
+                    <Button
+                        fx:id="buttonSave"
+                        prefWidth="90"
+                        mnemonicParsing="false"
+                        onAction="#handleSave"
+                        text="Speichern"
+                    />
+                    <Button
+                        prefWidth="90"
+                        mnemonicParsing="false"
+                        onAction="#handleCancel"
+                        text="Abbrechen"
+                    />
+                </HBox>
+            </right>
+        </BorderPane>
+    </bottom>
 </BorderPane>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml b/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
index 9c6d8ac..d20859a 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
@@ -119,7 +119,7 @@
                     fx:id="textAreaRemarks"
                     HBox.hgrow="ALWAYS"
             />
-            <VBox>
+            <VBox spacing="8.0">
                 <Button
                         fx:id="buttonSave"
                         prefWidth="90"