More tweaks and more work on the menu