Refactor HTML and somehow break everything

Needs fix ASAP, but this is good work I don’t want to lose