Upgrage to Boostrap 3

Several layout changes to make the current markup compatible with
Boostrap 3