#5729 UI improvements