Added lots of menus
Made menus a little more compact