Improved menu handling.