Improvements to Bootstrap 3 conversion