Made the menu smarter