Fixes misaligned comments on very long lines

Using <span> container also for main text, and switching orders of it

Closes-Bug: #93
Change-Id: I6bce1091ab947a874d3c808d388f1a9af754fbfa
Merge "Fixes misaligned comments on very long lines"