Bootstrap updates

Please review. I have some other ideas, but first would like to know if you are interested in code contributions.