Some improvements to the UX of the menus