Further refactor of HTML files.