Improved menu for better navigation