Upgraded to bootstrap 3 and improved layout with containers