Added & fixed bootstrap integration