More improvements to the UI.