Reorganized html templates