Work on the menu styles and some maintenance stuff