Bootstrap 3 upgrade, bug fixes, etc.