Bootstrap + couple enhancements