Update bootstrap, minor view adjustments and data import