minimal changes to html templates made