Updates to GUI and Code