Improvements to the menu