GUI and Model changes