Major Changes to GUI Setup