Updated Bootstrap compatibility