Clean up main menus xml and fix capitalization