Added some bootstrap and made a few fixes