Validation fixes.
Converted to new HTML format.