More Bootstrap 3 clean-up