Apply some more Bootstrap classes and HTML fixes

Prettify it a bit more :)