Continue Bootstrap enhancements