Tidy up XHTML

Move NOWRAP to class statement
Add missing semi-colon to &NBSP statement