HHCOC-50: Changes/Improvements to core UI Elements