I made a few changes to HTML I think
Fixed stuff for merge