Improved menu and view controller