Make all template html consistent