More changes to GUI