Changed menu behaviour