Address Farrel's feedback
Rebuild html