Added bootstrap and did some clean-up