diff --git a/app/static/app/js/dbcontrol.js b/app/static/app/js/dbcontrol.js
index d8a0eaf..e918bfa 100644
--- a/app/static/app/js/dbcontrol.js
+++ b/app/static/app/js/dbcontrol.js
@@ -316,12 +316,19 @@ function fillTableWithEntries(entries) {
             document.getElementById('editDatum').value = entry.date;
             if (entry.type === 2) {
                 document.getElementById('editldcCheck').checked = true;
-            } else if (entry.type === 3) {
+            } else {
+                document.getElementById('editldcCheck').checked = false;   
+            }
+            
+            if (entry.type === 3) {
                 document.getElementById('editsonstigesCheck').checked = true;
                 document.getElementById('editsonstigesInput').value = entry.sondertext;
                 document.getElementById('edit-sonstiges-text').style.display = 'block';
+            } else {
+                document.getElementById('editsonstigesCheck').checked = false;
+                document.getElementById('editsonstigesInput').value = null;
+                document.getElementById('edit-sonstiges-text').style.display = 'none';
             }
-            console.log(entry.id)
         })
         editCell.innerHTML = '<span class="btn btn-sm btn-secondary" data-bs-toggle="modal" data-bs-target="#editEntryModel" style="width: 40px; border-radius: 1rem;">✐</span>';
         row.appendChild(editCell)
diff --git a/app/static/app/js/home.js b/app/static/app/js/home.js
index 2f07532..3a70420 100644
--- a/app/static/app/js/home.js
+++ b/app/static/app/js/home.js
@@ -158,6 +158,13 @@ sonstigesCheck.addEventListener('change', function() {
 
 
 
+// 
+// BEARBEITUNGS FORMULAR
+// 
+document.getElementById('closeEditWindowButton').addEventListener(clearAllFields());
+
+
+
 //
 // FUNKTIONEN LIBARY
 //
@@ -195,4 +202,3 @@ function checkInput() {
         NewEntryButton.classList.replace('btn-primary', 'btn-light');
     }
 }
-
diff --git a/app/static/app/js/serviceworker.js b/app/static/app/js/serviceworker.js
index f499a52..be5ba1f 100644
--- a/app/static/app/js/serviceworker.js
+++ b/app/static/app/js/serviceworker.js
@@ -1,4 +1,4 @@
-var staticCacheName = "django-pwa-v" + new Date().getTime();
+var staticCacheName = "django-pwa-VI" + new Date().getTime();
 var filesToCache = [
     '/app/home',
 ];
diff --git a/app/static/app/js/welcomeControl.js b/app/static/app/js/welcomeControl.js
index 99e7560..ad2e5dd 100644
--- a/app/static/app/js/welcomeControl.js
+++ b/app/static/app/js/welcomeControl.js
@@ -4,12 +4,12 @@ function setAllOk() {
     document.getElementById('welcome_content').style.display = 'none';
     document.getElementById('dashboard').classList.remove('d-none');
     document.getElementById('refresh_icon').classList.remove('d-none')
-    document.getElementById('settings_icon').classList.remove('d-none')
+    // document.getElementById('settings_icon').classList.remove('d-none')
 }
 
 document.getElementById("allOk").addEventListener('click', function(){
-    setAllOk();
     localStorage.setItem('infoReadAllRead', "true");
+    setAllOk();
 })
 
 const ReadingState = localStorage.getItem('infoReadAllRead');
diff --git a/app/templates/app/home.html b/app/templates/app/home.html
index d9c9a4d..70401b9 100644
--- a/app/templates/app/home.html
+++ b/app/templates/app/home.html
@@ -10,7 +10,7 @@
     document.getElementById('maincontainer').classList.replace('align-items-center', 'align-items-top')
 </script>
 
-<div class="container" id="welcome_content"> <!-- d-none muss entfernt werden für richtige Funktion -->
+<div class="container" id="welcome_content">
     <h1>Wilkommen!</h1>
     <p>
         Schön das du hier bist!
@@ -187,7 +187,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="newEntryModalLabel">Eintrag bearbeiten</h5>
-                <button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal" aria-label="Schließen">X</button>
+                <button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal" aria-label="Schließen" id="closeEditWindowButton">X</button>
             </div>
             <div class="modal-body">
                 <form method="POST" action="">
@@ -196,7 +196,7 @@
                     <!-- Dauer in Stunden und Minuten -->
                     <div class="form-row">
                         <div class="form-group col-7">
-                            <label for="stunden"><b>Dauer</b></label>
+                            <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>
                                 <div class="input-group-append">
@@ -255,7 +255,7 @@
 
     /* Verarbeitung der Einstellungen */
 
-    const settingsIcon = document.getElementById('settings_icon')
+    {{/*  const settingsIcon = document.getElementById('settings_icon')
     settingsIcon.addEventListener('click', () => {
         document.getElementById('header-bg-block').classList.replace('HeaderDefaultHeightbg', 'openSettingsbg')
         document.getElementById('header-bg-block').classList.replace('closeSettingsbg', 'openSettingsbg')
@@ -271,9 +271,9 @@
         document.getElementById('settings_icon').classList.remove('d-none');
         document.getElementById('settings_close_icon').classList.add('d-none');
         document.getElementById('refresh_icon').style.opacity = 1;
-    })
+    })  */}}
 </script>
 
-<script src="{% static 'app/js/home.js' %}"></script>
 <script src="{% static 'app/js/welcomeControl.js' %}"></script>
+<script src="{% static 'app/js/home.js' %}"></script>
 {% endblock %}