Made the menus more intuitive