More changes related to UI.