diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh
index 9db0030..c4a5820 100755
--- a/scripts/ui/install_menu.sh
+++ b/scripts/ui/install_menu.sh
@@ -20,16 +20,16 @@ function install_ui() {
   echo -e "|  functions on a completely fresh system.              |"
   hr
   echo -e "| Firmware & API:          | 3rd Party Webinterface:    |"
-  echo -e "|  1) [Klipper]            |  6)  [OctoPrint]           |"
+  echo -e "|  1) [Klipper]            |  6) [OctoPrint]            |"
   echo -e "|  2) [Moonraker]          |                            |"
   echo -e "|                          | Other:                     |"
-  echo -e "| Klipper Webinterface:    |  7)  [PrettyGCode]         |"
-  echo -e "|  3) [Mainsail]           |  8)  [Telegram Bot]        |"
-  echo -e "|  4) [Fluidd]             |  9)  $(obico_install_title)|"
-  echo -e "|                          |  10) [OctoEverywhere For Klipper] |"
-  echo -e "|                          |                            |"
-  echo -e "| Touchscreen GUI:         | Webcam Streamer:           |"
-  echo -e "|  5) [KlipperScreen]      |  11) [Crowsnest]           |"
+  echo -e "| Klipper Webinterface:    |  7) [PrettyGCode]          |"
+  echo -e "|  3) [Mainsail]           |  8) [Telegram Bot]         |"
+  echo -e "|  4) [Fluidd]             |  9) $(obico_install_title) |"
+  echo -e "|                          | 10) [OctoEverywhere]       |"
+  echo -e "| Touchscreen GUI:         |                            |"
+  echo -e "|  5) [KlipperScreen]      | Webcam Streamer:           |"
+  echo -e "|                          | 11) [Crowsnest]            |"
   back_footer
 }
 
diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh
index 56d868e..d9f3b38 100755
--- a/scripts/ui/main_menu.sh
+++ b/scripts/ui/main_menu.sh
@@ -19,21 +19,21 @@ function main_ui() {
   top_border
   echo -e "|     $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~")     |"
   hr
-  echo -e "|  0) [Log-Upload]   |       Klipper: $(print_status "klipper")|"
-  echo -e "|                    |          Repo: $(print_klipper_repo)|"
-  echo -e "|  1) [Install]      |                                  |"
-  echo -e "|  2) [Update]       |     Moonraker: $(print_status "moonraker")|"
-  echo -e "|  3) [Remove]       |                                  |"
-  echo -e "|  4) [Advanced]     |      Mainsail: $(print_status "mainsail")|"
-#  echo -e "|  5) [Backup]       |        Fluidd: $(print_status "fluidd")|"
-  echo -e "|                    |        Fluidd: $(print_status "fluidd")|"
-  echo -e "|                    | KlipperScreen: $(print_status "klipperscreen")|"
-  echo -e "|  6) [Settings]     |  Telegram Bot: $(print_status "telegram_bot")|"
-  echo -e "|                    |     Crowsnest: $(print_status "crowsnest")|"
-  echo -e "|                    |         Obico: $(print_status "moonraker_obico")|"
-  echo -e "|                    |OctoEverywhere: $(print_status "octoeverywhere")|"
-  echo -e "|                    |                                  |"
-  echo -e "|  $(print_kiauh_version)|     Octoprint: $(print_status "octoprint")|"
+  echo -e "|  0) [Log-Upload] |         Klipper: $(print_status "klipper")|"
+  echo -e "|                  |            Repo: $(print_klipper_repo)|"
+  echo -e "|  1) [Install]    |                                    |"
+  echo -e "|  2) [Update]     |       Moonraker: $(print_status "moonraker")|"
+  echo -e "|  3) [Remove]     |                                    |"
+  echo -e "|  4) [Advanced]   |        Mainsail: $(print_status "mainsail")|"
+#  echo -e "|  5) [Backup]     |        Fluidd: $(print_status "fluidd")|"
+  echo -e "|                  |          Fluidd: $(print_status "fluidd")|"
+  echo -e "|                  |   KlipperScreen: $(print_status "klipperscreen")|"
+  echo -e "|  6) [Settings]   |    Telegram Bot: $(print_status "telegram_bot")|"
+  echo -e "|                  |       Crowsnest: $(print_status "crowsnest")|"
+  echo -e "|                  |           Obico: $(print_status "moonraker_obico")|"
+  echo -e "|                  |  OctoEverywhere: $(print_status "octoeverywhere")|"
+  echo -e "|                  |                                    |"
+  echo -e "|  $(print_kiauh_version)|       Octoprint: $(print_status "octoprint")|"
   quit_footer
 }
 
@@ -46,7 +46,7 @@ function get_kiauh_version() {
 
 function print_kiauh_version() {
   local version
-  version="$(printf "%-18s" "$(get_kiauh_version)")"
+  version="$(printf "%-16s" "$(get_kiauh_version)")"
   echo "${cyan}${version}${white}"
 }
 
diff --git a/scripts/ui/update_menu.sh b/scripts/ui/update_menu.sh
index 15ec0e9..26a51e8 100755
--- a/scripts/ui/update_menu.sh
+++ b/scripts/ui/update_menu.sh
@@ -33,9 +33,9 @@ function update_ui() {
   echo -e "|  7) [Telegram Bot]     |$(compare_telegram_bot_versions)|"
   echo -e "|  8) [Obico for Klipper]|$(compare_moonraker_obico_versions)|"
   echo -e "|  9) [OctoEverywhere]   |$(compare_octoeverywhere_versions)|"
-  echo -e "|  10)[Crowsnest]        |$(compare_crowsnest_versions)|"
+  echo -e "| 10) [Crowsnest]        |$(compare_crowsnest_versions)|"
   echo -e "|                        |------------------------------|"
-  echo -e "|  11)[System]           |  $(check_system_updates)   |"
+  echo -e "| 11) [System]           |  $(check_system_updates)   |"
   back_footer
 }