Integrated some bootstrap
Fixed some merging issues