Changes to GUI and bug fixes