Upgrades to support bootstrap 3.x