diff --git a/app/public/add_entry.php b/app/public/add_entry.php
index bc6517d..179d714 100644
--- a/app/public/add_entry.php
+++ b/app/public/add_entry.php
@@ -5,30 +5,32 @@
     $user_data = check_login($con);
 
     if($_SERVER['REQUEST_METHOD'] == "POST") {
-        $points = sanitize_input($_POST['points']);
-        $minutes = sanitize_input($_POST['minutes']);
-        $seconds = sanitize_input($_POST['seconds']);
-        $miliseconds = sanitize_input($_POST['miliseconds']);
-        $s_id = sanitize_input($_GET['station']);
-        $m_id = sanitize_input($_POST['team']);
+        if(isset($_POST['save'])){
+            $points = sanitize_input($_POST['points']);
+            $minutes = sanitize_input($_POST['minutes']);
+            $seconds = sanitize_input($_POST['seconds']);
+            $miliseconds = sanitize_input($_POST['miliseconds']);
+            $s_id = sanitize_input($_GET['station']);
+            $m_id = sanitize_input($_POST['team']);
 
-        if($minutes == 0 && $seconds == 0 && $miliseconds == 0){
-            $time = null;
-        } else {
-            if ($minutes < 10) {
-                $minutes = "0" . $minutes;
-            }
+            if($minutes == 0 && $seconds == 0 && $miliseconds == 0){
+                $time = null;
+            } else {
+                if ($minutes < 10) {
+                    $minutes = "0" . $minutes;
+                }
 
-            if ($seconds < 10) {
-                $seconds = "0" . $seconds;
-            }
+                if ($seconds < 10) {
+                    $seconds = "0" . $seconds;
+                }
 
-            if ($miliseconds < 10) {
-                $miliseconds = "0" . $miliseconds;
+                if ($miliseconds < 10) {
+                    $miliseconds = "0" . $miliseconds;
+                }
+                $time = "00:" . $minutes . ":" . $seconds . "." . $miliseconds;
             }
-            $time = "00:" . $minutes . ":" . $seconds . "." . $miliseconds;
+            write_points($con, $s_id, $m_id, $points, $time);
         }
-        write_points($con, $s_id, $m_id, $points, $time);
         header("Location: statistik.php");
         die;
     }
@@ -71,7 +73,8 @@
                     </div>
                 </div>
                 <div>
-                    <input id="button" type="submit" value="Eintragen" class="btn-confirm"/>
+                    <input id="button" type="submit" value="Eintragen" class="btn-confirm" name="save"/>
+                    <input id="close" type="submit" value="Schließen" class="btn-confirm" name="close">
                 </div>
             </form>
         </div>
diff --git a/app/public/add_station.php b/app/public/add_station.php
index a2cd326..7ca9f53 100644
--- a/app/public/add_station.php
+++ b/app/public/add_station.php
@@ -5,9 +5,11 @@
     $user_data = check_login($con);
 
     if($_SERVER['REQUEST_METHOD'] == "POST") {
-        $station_name = sanitize_input($_POST['station_name']);
-        $station_pos = sanitize_input($_POST['station_pos']);
-        write_station($con, $station_name, $station_pos);
+        if(isset($_POST['save'])){
+            $station_name = sanitize_input($_POST['station_name']);
+            $station_pos = sanitize_input($_POST['station_pos']);
+            write_station($con, $station_name, $station_pos);
+        }
         header("Location: stationen.php");
         die;
     }
@@ -23,16 +25,17 @@
         <div class="form_div">
             <form method="post">
                 <div class="txt_field">
-                    <input id="station_name" type="text" name="station_name" required/>
+                    <input class="input_field" id="station_name" type="text" name="station_name" required/>
                     <span></span>
                     <label for="station_name">Name</label>
                 </div>
                 <div class="txt_field">
-                    <input id="station_pos" type="text" name="station_pos" required/>
+                    <input class="input_field" id="station_pos" type="text" name="station_pos" required/>
                     <span></span>
                     <label for="station_pos">Standort</label>
                 </div>
-                <input id="button" type="submit" value="Hinzufügen" class="btn-confirm"/>
+                <input id="button" type="submit" value="Hinzufügen" class="btn-confirm" name="save"/>
+                <a href="stationen.php" class="btn-close">Schließen</a>
             </form>
         </div>
     </div>
diff --git a/app/public/add_team.php b/app/public/add_team.php
index 97a9484..a10125a 100644
--- a/app/public/add_team.php
+++ b/app/public/add_team.php
@@ -5,9 +5,11 @@
     $user_data = check_login($con);
 
     if($_SERVER['REQUEST_METHOD'] == "POST") {
-        $team_name = sanitize_input($_POST['team_name']);
-        $fire_department = sanitize_input($_POST['fire_department']);
-        write_team($con, $team_name, $fire_department);
+        if(isset($_POST['save'])) {
+            $team_name = sanitize_input($_POST['team_name']);
+            $fire_department = sanitize_input($_POST['fire_department']);
+            write_team($con, $team_name, $fire_department);
+        }
         header("Location: mannschaft.php");
         die;      
     }
@@ -37,7 +39,8 @@
                     <span></span>
                     <label for="fire_department">Feuerwehr</label>
                 </div>
-                <input id="button" type="submit" value="Hinzufügen" class="btn-confirm"/>
+                <input id="button" type="submit" value="Hinzufügen" class="btn-confirm" name="save"/>
+                <a href="mannschaft.php">Schließen</a>
             </form>
         </div>
     </div>
diff --git a/app/public/add_user.php b/app/public/add_user.php
index 2231ac8..cd8f671 100644
--- a/app/public/add_user.php
+++ b/app/public/add_user.php
@@ -64,6 +64,7 @@
                     </select> 
                 </div>
                 <input type="submit" value="Hinzufügen" class="btn-confirm"/>
+                <a href="manage_user.php">Schließen</a>
             </form>
         </div>
     </div>
diff --git a/app/public/css/edit.css b/app/public/css/edit.css
index 9e0b942..a0426de 100644
--- a/app/public/css/edit.css
+++ b/app/public/css/edit.css
@@ -130,6 +130,10 @@ form .txt_field{
     width: 100%;
 }
 
+.btn-close a {
+    text-decoration: none;
+}
+
 .form_div {
     margin-left: 5px;
     margin-right: 5px;
diff --git a/app/public/header_footer/header.php b/app/public/header_footer/header.php
index 4cd90bd..98f7ba9 100644
--- a/app/public/header_footer/header.php
+++ b/app/public/header_footer/header.php
@@ -9,6 +9,7 @@
         <link rel="stylesheet" href="css/edit.css">
         <script src="js/navbar.js" defer></script>
         <script src="js/edit_table.js"></script>
+        <script src="js/add_entries.js"></script>
     </head>
     <body>
         <header>