More changes to main GUI