upgrade bootstrap, simplify