Fixed Bootstrap Issues
Merge pull request #204 from ndomar/Fixed_Bootstrap_issues

Fixed Bootstrap Issues
master again