More changes to the UI design