Add better support for bootstrap 3