Completed bootstrap 3 conversion