Improved menu slightly