More work on fixing the html templates.