Changes for bootstrap 2 -> bootstrap 3