Changes on html templates