diff --git a/menu/menu-ap b/menu/menu-ap
index 25bb8c0..2b9581d 100644
--- a/menu/menu-ap
+++ b/menu/menu-ap
@@ -1,66 +1,65 @@
 #!/bin/bash
-if [ "$(cat /proc/cpuinfo | grep 'Raspberry')" != "" ]; then
-#menu-ap
-sudo cat > /bin/menu-ap <<- "EOF"
+
+# Check if the script is running on a Raspberry Pi
+if [ "$(grep 'Raspberry' /proc/cpuinfo)" != "" ]; then
+    # Create the menu-ap script
+    sudo cat > /bin/menu-ap <<- "EOF"
 #!/bin/bash
+
 while : ; do
-choix=$(whiptail --title "WiFi auto AP option" --menu "Select enable or disable auto AP mode." 20 75 11 \
-1 " Disable auto AP mode" \
-2 " Enable auto AP mode " \
-3 " Menu Principal " 3>&1 1>&2 2>&3)
-exitstatus=$?
-#on recupere ce choix
-#exitstatus=$?
-if [ $exitstatus = 0 ]; then
-    echo "Your chosen option:" $choix
-else
-    echo "You chose cancel."; break;
-fi
-# case : action en fonction du choix
-case $choix in
-1)
-#!/bin/bash
+    choix=$(whiptail --title "WiFi auto AP option" --menu "Select enable or disable auto AP mode." 20 75 11 \
+    1 "Disable auto AP mode" \
+    2 "Enable auto AP mode" \
+    3 "Menu Principal" 3>&1 1>&2 2>&3)
+    exitstatus=$?
 
-# Lista de servicios a reiniciar
-servicios=("autoap.service")
-
-# Recorre la lista de servicios y verifica si están activos
-for servicio in "${servicios[@]}"; do
-    if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then
-        echo "stop $servicio"
-        sudo systemctl disable "$servicio"
-        sudo systemctl stop "$servicio"
+    # Check if the user selected an option
+    if [ $exitstatus = 0 ]; then
+        echo "Your chosen option:" $choix
+    else
+        echo "You chose cancel."
+        break
     fi
-done
- ;;
-2)
-#!/bin/bash
 
-# Lista de servicios a reiniciar
-servicios=("autoap.service")
+    # Perform actions based on user choice
+    case $choix in
+        1)
+            # Disable auto AP mode
+            servicios=("autoap.service")
+            for servicio in "${servicios[@]}"; do
+                if systemctl is-enabled "$servicio" >/dev/null 2>&1; then
+                    echo "Disabling $servicio"
+                    sudo systemctl disable "$servicio"
+                    sudo systemctl stop "$servicio"
+                fi
+            done
+            ;;
+        2)
+            # Enable auto AP mode
+            servicios=("autoap.service")
+            for servicio in "${servicios[@]}"; do
+                if systemctl is-enabled "$servicio" >/dev/null 2>&1; then
+                    echo "Restarting $servicio"
+                    sudo systemctl restart "$servicio"
+                else
+                    echo "Starting and enabling $servicio"
+                    sudo systemctl start "$servicio"
+                    sudo systemctl enable "$servicio"
+                fi
+            done
+            ;;
+        3)
+            # Exit the menu
+            break
+            ;;
+    esac
+done
 
-# Recorre la lista de servicios y verifica si están activos
-for servicio in "${servicios[@]}"; do
-    if systemctl status "$servicio" | grep "service; enabled;" >/dev/null 2>&1; then
-        echo "restart $servicio"
-        sudo systemctl stop "$servicio"
-        sudo systemctl start "$servicio"
-      else
-         echo "start $servicio"
-        sudo systemctl stop "$servicio"
-        sudo systemctl start "$servicio"
-        sudo systemctl enable "$servicio"        
-    fi
-done
-;;
-3)
-break;
-esac
-done
 exit 0
 EOF
-#
-chmod +x /bin/menu-ap
-ln -sf /bin/menu-ap /bin/MENU-AP
-chmod +x /bin/MENU*
-fi
\ No newline at end of file
+
+    # Make the script executable
+    chmod +x /bin/menu-ap
+    ln -sf /bin/menu-ap /bin/MENU-AP
+    chmod +x /bin/MENU-AP
+fi