More changes to the UI