More bootstrp integration
More bootstrap changes