Started reworking html
Somewhere in the middle