Fix bugs arising from last changes.
Fix all the html errors causing the pages not to validate.