Bootstrap upgrade

Just a first pass. Looking for style errors.