Changes

- Bootstrap
- small fixes