Bootstrap enhancements