Partial changes for bootstrap 3