Further improvements to Bootstrap 3 upgrade