Various updates

- Upgrade to Bootstrap 3
- Update spacing and drop subpackage tag