Some fixes for support bootstrap 3
Bootstrap 3 support