Updated with changes to Menus and Outliner