Small changes to GUI generate