Restructured the menus some more to make them easier to use