HHCOC-63: Minor text/layout improvements