Boostrap 3 compliant

The code is still a mess, we need to tidy it up
Merge commit '2a5d0b2'