#868 Improve Bootstrap 3.2 implementation