A number of cosmetic and functional changes.

All changes are in the bootstrap theme.