reorganized menus from left nav to topbar