Cleaning up some stuff with menus