Improved menu, added buttons