switch to bootstrap; other improvements