Fix bootstrap 3 issues