RT# 75817 - updated UI to be more intuitive