Really big clean of the menu handling