diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh
index 8ac01c0..c17942f 100755
--- a/scripts/ui/install_menu.sh
+++ b/scripts/ui/install_menu.sh
@@ -29,10 +29,6 @@ function install_ui() {
   echo -e "|                          |                            |"
   echo -e "| Touchscreen GUI:         | Webcam Streamer:           |"
   echo -e "|  5) [KlipperScreen]      | 10) [Crowsnest]            |"
-#  echo -e "| Touchscreen GUI:         |                            |"
-#  echo -e "|  5) [KlipperScreen]      |                            |"
-#  echo -e "| Touchscreen GUI:         | Webcam Streamer:           |"
-#  echo -e "|  5) [KlipperScreen]      | 10) [MJPG-Streamer]        |"
   back_footer
 }
 
@@ -70,11 +66,6 @@ function install_menu() {
         do_action "moonraker_obico_setup_dialog" "install_ui";;
       10) 
         do_action "install_crowsnest" "install_ui";;
-#      10)
-#        do_action "install_mjpg-streamer" "install_ui";;
-#        clear && print_header
-#        print_error "Function currently disabled! Sorry!"
-#        install_ui;;
       B|b)
         clear; main_menu; break;;
       *)
diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh
index ad9c14f..42e9a06 100755
--- a/scripts/ui/main_menu.sh
+++ b/scripts/ui/main_menu.sh
@@ -29,8 +29,8 @@ function main_ui() {
   echo -e "|                    |        Fluidd: $(print_status "fluidd")|"
   echo -e "|                    | KlipperScreen: $(print_status "klipperscreen")|"
   echo -e "|  6) [Settings]     |  Telegram Bot: $(print_status "telegram_bot")|"
-  echo -e "|                    |         Obico: $(print_status "moonraker_obico")|"
   echo -e "|                    |     Crowsnest: $(print_status "crowsnest")|"
+  echo -e "|                    |         Obico: $(print_status "moonraker_obico")|"
   echo -e "|                    |                                  |"
   echo -e "|  $(print_kiauh_version)|     Octoprint: $(print_status "octoprint")|"
   quit_footer
diff --git a/scripts/ui/remove_menu.sh b/scripts/ui/remove_menu.sh
index a1aed4d..2cae157 100755
--- a/scripts/ui/remove_menu.sh
+++ b/scripts/ui/remove_menu.sh
@@ -21,10 +21,9 @@ function remove_ui() {
   echo -e "|  1) [Klipper]             |  6) [OctoPrint]           |"
   echo -e "|  2) [Moonraker]           |                           |"
   echo -e "|                           | Webcam Streamer:          |"
-  echo -e "| Klipper Webinterface:     |  7) [MJPG-Streamer]       |"
-  echo -e "|  3) [Mainsail]            | 12) [Crowsnest]           |"
-  echo -e "|  4) [Fluidd]              |                           |"
-  echo -e "|                           | Other:                    |"
+  echo -e "| Klipper Webinterface:     |  7) [Crowsnest]           |"
+  echo -e "|  3) [Mainsail]            |                           |"
+  echo -e "|  4) [Fluidd]              | Other:                    |"
   echo -e "|                           |  8) [PrettyGCode]         |"
   echo -e "| Touchscreen GUI:          |  9) [Telegram Bot]        |"
   echo -e "|  5) [KlipperScreen]       | 10) [Obico for Klipper]   |"
@@ -52,7 +51,7 @@ function remove_menu() {
       6)
         do_action "remove_octoprint" "remove_ui";;
       7)
-        do_action "remove_mjpg-streamer" "remove_ui";;
+        do_action "remove_crowsnest" "remove_ui";;
       8)
         do_action "remove_prettygcode" "remove_ui";;
       9)
@@ -61,8 +60,6 @@ function remove_menu() {
         do_action "remove_moonraker_obico" "remove_ui";;
       11)
         do_action "remove_nginx" "remove_ui";;
-      12) 
-        do_action "remove_crowsnest" "remove_ui";;
       B|b)
         clear; main_menu; break;;
       *)