Staging

@kadst43 The fix for the settings button on the main menu is in here as well as all of the updates to the editor.