Tidy up misc. XHTML

Close FORM tag correctly
Add missing TD and TR tags
Move NOWRAP into CLASS statement