More refactoring of the html output.  Fixed bad param exception.
Cleaning.