Change: MenuGUI refactoring - almost works
Change: MenuGUI refactoring polishing