+ Added bootstrap
+ Adapted to added bootstrap