Add Bootstrap, update containers