GUI & Menu Improvements