Menu Updates

All menus are working