Updated with changes to menus and outliner