Begin HTML refafactor