Some improvements to UI.