Work on the menu and some maintenance stuff