Improved menu handling