CONTENTBOX-350
Usability UI updates