finished bootstrap changes