Finally upgraded to Bootstrap 3