Performance improvement for the UI.