Updated to work better with bootstrap 3