More changes to the UI.
fixed merger conflict
Fixed small UI changes