#10 Improvements to menu items