Fixes related to bootstrap 3.0