Improved menu behavior