LPS-46733 Minor UI improvements