Standardize html

Visually is almost exact same (few minor changes). HTML Is completely different though. It will most likely be easier if you guys push any changes you can before merging this. I can merge and handle the diffs. let me know.