Updated and new HTML templates