Updates to editor, and main menu