#5729 UI changes