Improve coding style on HTML templates

Improve coding style on HTML templates