Tidy up markup and optimise CSS and images

* Makes markup a little tidier (Ctrl+Alt+l on phpstorm)
* Merges some css properties and removes px on 0px as it's deprecated
* Removes commented html as git lets you retrieve it anyway