Fixes for Bootstrap upgrade and other visual tweaks.
Merge pull request #4115 from adobe/larz/framework-update-fixes

Cosmetic fixes after framework update