Switched more menus to the new style