Round two of Bootstrap 3 upgrades. Plus some cleanup.