Few changes to menu logic.