diff --git a/bin/pwnagotchi b/bin/pwnagotchi
index af82690c..dc4c6812 100755
--- a/bin/pwnagotchi
+++ b/bin/pwnagotchi
@@ -160,22 +160,22 @@ if __name__ == '__main__':
         sys.exit(0)
 
     if args.wizard:
-        pwn_restore = input("Do you want to restore the previous configuration? [y/n]\n")
+        pwn_restore = input("Do you want to restore the previous configuration? [Y/N]\n")
         if pwn_restore in ('y', 'yes'):
             os.system("mv -f /etc/pwnagotchi/config.toml.bak /etc/pwnagotchi/config.toml")
             print("Your previous configuration is restored, and I will restart in 5 seconds.")
             time.sleep(5)
             os.system("service pwnagotchi restart")
         else:
-            pwn_check = input("This will create a new configuration file and backup your current one, are you sure? [y/n]")
+            pwn_check = input("This will create a new configuration file and backup your current one, are you sure? [Y/N]\n")
             if pwn_check.lower() in ('y', 'yes'):
                 os.system("mv -f /etc/pwnagotchi/config.toml /etc/pwnagotchi/config.toml.bak")
                 with open("/etc/pwnagotchi/config.toml", "a+") as f:
                     f.write("# Do not edit this file if you do not know what you are doing!!!\n\n")
                     # Set pwnagotchi name
                     print("Welcome to the interactive installation of your personal Pwnagotchi configuration!\n"
-                          "My name is Jayofelony, how may I call you? ")
-                    pwn_name = input("Pwnagotchi name (no spaces):")
+                          "My name is Jayofelony, how may I call you?\n")
+                    pwn_name = input("Pwnagotchi name (no spaces): ")
                     if pwn_name == "":
                         pwn_name = "Pwnagotchi"
                         print("I shall go by Pwnagotchi from now on!")
@@ -188,43 +188,43 @@ if __name__ == '__main__':
                     pwn_whitelist = input("How many networks do you want to whitelist? "
                                           "We will also ask a MAC for each network?\n"
                                           "Each SSID and BSSID count as 1 network. \n\n"
-                                          "Be sure to use digits as your answer.")
+                                          "Be sure to use digits as your answer.\n\n Amount of networks: ")
                     if int(pwn_whitelist) > 0:
                         f.write("main.whitelist = [\n")
                         for x in range(int(pwn_whitelist)):
-                            ssid = input("SSID (Name):")
-                            bssid = input("BSSID (MAC):")
+                            ssid = input("SSID (Name): ")
+                            bssid = input("BSSID (MAC): ")
                             f.write("\t\"" + ssid + "\",\n")
                             f.write("\t\"" + bssid + "\",\n")
                         f.write("]\n")
                     # set bluetooth tether
-                    pwn_bluetooth = input("Do you want to enable BT-Tether? [y/n]")
+                    pwn_bluetooth = input("Do you want to enable BT-Tether? [Y/N]")
                     if pwn_bluetooth.lower() in ('y', 'yes'):
                         f.write("main.plugins.bt-tether.enabled = true\n\n")
-                        pwn_bluetooth_device = input("What device do you use? Android or iOS?")
+                        pwn_bluetooth_device = input("What device do you use? Android or iOS? ")
                         if pwn_bluetooth_device.lower() == "android":
                             f.write("main.plugins.bt-tether.devices.android-phone.enabled = true\n")
-                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device?")
+                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device? ")
                             if pwn_bluetooth_mac != "":
                                 f.write("main.plugins.bt-tether.devices.android-phone.mac = \""+pwn_bluetooth_mac+"\"\n")
                         elif pwn_bluetooth_device.lower() == "ios":
                             f.write("main.plugins.bt-tether.devices.ios-phone.enabled = true\n")
-                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device?")
+                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device? ")
                             if pwn_bluetooth_mac != "":
                                 f.write("main.plugins.bt-tether.devices.android-phone.mac = \"" + pwn_bluetooth_mac + "\"\n")
                     # set up display settings
-                    pwn_display_enabled = input("Do you use a display? [y/n]")
+                    pwn_display_enabled = input("Do you use a display? [Y/N]\n")
                     if pwn_display_enabled.lower() in ('y', 'yes'):
                         f.write("ui.display.enabled = true\n")
                         pwn_display_type = input("What display do you use?\n\n"
                                                  "Be sure to check for the correct display type @ \n"
-                                                 "https://github.com/jayofelony/pwnagotchi/blob/master/pwnagotchi/utils.py#L240-L431")
+                                                 "https://github.com/jayofelony/pwnagotchi/blob/master/pwnagotchi/utils.py#L240-L431\n")
                         if pwn_display_type != "":
                             f.write("ui.display.type = \""+pwn_display_type+"\"\n")
-                        pwn_display_invert = input("Do you want to invert the display colors? [y/n]\n\n"
-                                                   "No = Black background\n"
-                                                   "Yes = White background")
-                        if pwn_display_invert in ('y', 'yes'):
+                        pwn_display_invert = input("Do you want to invert the display colors? [Y/N]\n\n"
+                                                   "N = Black background\n"
+                                                   "Y = White background\n")
+                        if pwn_display_invert.lower() in ('y', 'yes'):
                             f.write("ui.invert = true\n")
                     f.close()
                     print("Your configuration is done, and I will restart in 5 seconds.")
@@ -249,7 +249,7 @@ if __name__ == '__main__':
         local = version_to_tuple(pwnagotchi.__version__)
         remote = version_to_tuple(latest_ver)
         if remote > local:
-            user_input = input("There is a new version available! Update from v%s to v%s?\n[y/n]"
+            user_input = input("There is a new version available! Update from v%s to v%s?\n[Y/N] "
                                % (pwnagotchi.__version__, latest_ver))
             # input validation
             if user_input.lower() in ('y', 'yes'):