Improved menu layout