added bootstrap (again) and integrated it