BZ-9469: cleaning up markup, adding right column content