Added bootstrap collapse and other cosmetic changes