Changed bootstrap, added a few other thing