Updated GUI and Controller