Revert back some BuilderGUI changes