changed whole menu behavior