BZ-8443 - revising markup
BZ-9568 - removing info icon