Updates to incorporate bootstrap 3.0