More Bootstrap 2 -> 3 conversion