Restructured HTML building