Additional improvement to the UI.