Markup basic html

Some simple html markup. deleted some &nbsp;'s, added classes for consistency.

Tests passing.