More updates for switching to bootstrap3