diff --git a/client/bs_shutdown.py b/client/bs_shutdown.py
index 5d9983b..b0e388c 100644
--- a/client/bs_shutdown.py
+++ b/client/bs_shutdown.py
@@ -49,7 +49,7 @@ def set_shutdown(time, now):
 
 def remove_shutdown():
     print("[BS Shutdown] Removed shutdown")
-    # subprocess.run(["shutdown", "/s", "/t", (time - now), " "])
+    # subprocess.run(["shutdown", "/a"])
 
 def update():
     global LAST_VALUE
@@ -58,8 +58,8 @@ def update():
 
     if data is not None and data["noshutdown"] == 1:
         if (LAST_VALUE != 0):
+            remove_shutdown() # In case
             LAST_VALUE = 0
-            remove_shutdown()
         return
 
     if data is None:
diff --git a/server/src/data/templates/index.html b/server/src/data/templates/index.html
index e627ba1..f50a662 100644
--- a/server/src/data/templates/index.html
+++ b/server/src/data/templates/index.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% block content %}
 
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
+
 <div class="container py-4">
 
     <div class="card bg-dark bg-opacity-75 p-3 mb-4">
@@ -30,12 +32,25 @@
                 </div>
             </div>
             <div class="col-auto">
-                <button type="submit" class="btn btn-secondary">
-                    Ajouter
+                <button type="submit" class="btn btn-primary">
+                    <i class="bi bi-plus-lg"></i> Ajouter
                 </button>
             </div>
 
         </form>
+        <div class="col-md-2">
+            <form method="post" action="/submit-default" class="row g-2 align-items-center justify-content-start">
+                <select name="default-time" class="form-select bg-dark text-white" id="default-time-select">
+                    {% for hour in range(0, 24) %}
+                        <option value="{{ '%02d:00'|format(hour) }}">{{ '%02d:00'|format(hour) }}</option>
+                        <option value="{{ '%02d:30'|format(hour) }}">{{ '%02d:30'|format(hour) }}</option>
+                    {% endfor %}
+                </select>
+                <button type="submit" class="btn btn-sm btn-primary">
+                    <i class="bi bi-save"></i>Sauvegarder
+                </button>
+            </form>
+            </div>
     </div>
 
     <div class="card bg-dark bg-opacity-75 p-3">
@@ -70,7 +85,9 @@
                     <div class="col-2 text-end">
                         <form method="post" action="/delete" class="m-0">
                             <input type="hidden" name="item_name" value="{{ item.name }}">
-                            <button type="submit" class="btn btn-sm btn-danger">&times;</button>
+                            <button type="submit" class="btn btn-sm btn-danger">
+                                <i class="bi bi-x-lg"></i>Supprimer
+                            </button>
                         </form>
                     </div>
                 </div>