Clean up some existing menus and add a few more menus.