diff --git a/app/static/app/js/home.js b/app/static/app/js/home.js
index aefd7ed..24b6a7a 100644
--- a/app/static/app/js/home.js
+++ b/app/static/app/js/home.js
@@ -78,6 +78,7 @@ NewEntryButton.addEventListener('click', () => {
     }
 })
 
+
 async function getActualDataAndFillView() {
     try {
 
@@ -162,7 +163,55 @@ sonstigesCheck.addEventListener('change', function() {
 // 
 // BEARBEITUNGS FORMULAR
 // 
-document.getElementById('closeEditWindowButton').addEventListener(clearAllFields());
+
+document.getElementById('closeEditWindowButton').addEventListener('click', () => {
+    
+    // console.log('close edit window')
+});
+
+
+
+document.getElementById('editEntrySubmitButton').addEventListener('click', () => {
+    const ToEditID = document.getElementById('editEntryID').value
+    const editHours = document.getElementById('editStunden').value
+    const editMins = document.getElementById('editMinuten').value
+
+    // console.log(`ID: ${ToEditID}, Hours: ${editHours}, Minutes: ${editMins}`)
+
+    var type = 1
+
+    // Abfragen der Checkboxen
+    const ldcCheck = document.getElementById('editldcCheck').checked
+    if (ldcCheck) {
+        type = 2 
+        document.getElementById('editldcCheck').checked = false
+    } else if (document.getElementById('editsonstigesCheck').checked) {
+        type = 3;
+        document.getElementById('editsonstigesCheck').checked = false;
+        sonstigesText.style.display = 'none';
+    }
+
+    updateEntry(parseInt(ToEditID), {
+        date: document.getElementById('editDatum').value,
+        duration: (parseInt(editHours)*60) + parseInt(editMins),
+        type: type,
+        status: 1,
+        sondertext: document.getElementById('editsonstigesInput').value,
+    }).then(() => {
+        // console.log('Eintrag aktualisiert.');
+        location.reload()
+    });
+})
+
+document.getElementById('DeleteEntryButton').addEventListener('click', () => {
+    const ToEditID = document.getElementById('editEntryID').value
+
+    deleteEntry(parseInt(ToEditID)).then(() => {
+        console.log(`Löschen von Eintrag: ${ToEditID}`);
+        location.reload()
+    })
+
+})
 
 
 
diff --git a/app/templates/app/home.html b/app/templates/app/home.html
index 70401b9..b00541d 100644
--- a/app/templates/app/home.html
+++ b/app/templates/app/home.html
@@ -198,11 +198,11 @@
                         <div class="form-group col-7">
                             <label for="editStunden"><b>Dauer</b></label>
                             <div class="input-group">
-                                <input type="number" class="form-control" id="editStunden" placeholder="00" min="0" max="99" maxlength="2" required>
+                                <input type="number" class="form-control editItem" id="editStunden" placeholder="00" min="0" max="99" maxlength="2" required>
                                 <div class="input-group-append">
                                     <span class="input-group-text">h</span>
                                 </div>
-                                <input type="number" class="form-control" id="editMinuten" placeholder="00" min="0" max="59" maxlength="2" value="0" required>
+                                <input type="number" class="form-control editItem" id="editMinuten" placeholder="00" min="0" max="59" maxlength="2" value="0" required>
                                 <div class="input-group-append">
                                     <span class="input-group-text">min</span>
                                 </div>
@@ -213,7 +213,7 @@
                     <!-- Datum -->
                     <div class="form-group">
                         <label for="datum"><b>Datum</b></label>
-                        <input type="date" class="form-control" id="editDatum" required>
+                        <input type="date" class="form-control editItem" id="editDatum" required>
                     </div>
 
                     <!-- Auswahl LDC oder Sonstiges (Checkboxen) -->
@@ -221,11 +221,11 @@
                         <label for="optionen"><b>Optionen:</b></label>
                         <div>
                             <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="checkbox" id="editldcCheck" name="optionen" value="LDC">
+                                <input class="form-check-input editItem" type="checkbox" id="editldcCheck" name="optionen" value="LDC">
                                 <label class="form-check-label" for="ldcCheck">LDC</label>
                             </div>
                             <div class="form-check form-check-inline">
-                                <input class="form-check-input" type="checkbox" id="editsonstigesCheck" name="optionen" value="Sonstiges">
+                                <input class="form-check-input editItem" type="checkbox" id="editsonstigesCheck" name="optionen" value="Sonstiges">
                                 <label class="form-check-label" for="sonstigesCheck">Sonstiges</label>
                             </div>
                         </div>
@@ -236,7 +236,7 @@
                         <!-- 
                             <label for="sonstigesInput">Beschreibung:</label>
                          -->
-                        <input type="text" class="form-control" id="editsonstigesInput" placeholder="max. 10 Zeichen" maxlength="10">
+                        <input type="text" class="form-control editItem" id="editsonstigesInput" placeholder="max. 10 Zeichen" maxlength="10">
                     </div>
                     <button type="button" class="btn btn-primary" id="editEntrySubmitButton" data-bs-dismiss="modal">Speichern</button>
                     <button type="button" class="btn btn-danger" id="DeleteEntryButton" data-bs-dismiss="modal">Löschen</button>