Updated UI for new merge request
Closes#2540


See merge request !3228