Added bootstrap styling and new feature-TODO's