Start migration to using Bootstrap

These changes were intended to be part of the previous checkin