Tidying up code

Finished neatening up syntax.

TO DO: Remake class names and use official bootstrap classes