#20057 UI improvements