WIP Gui Editor cleanup