Edit*Update* Add Gui and fix user input loop after switch