Changed various bootsrap functionalities