Major Update to GUI