Conversion to Bootstrap 3 is more complete