Removed &nbsp; again in favour of comments containing the element position to make sure the span tags are not removed by HTML cleaners without having to use real characters.
Streamlined HTML and CSS output for better readability.