Some cleanup of the UI.