LRA-168 ui updates
merge