Improvements to the ui.