Bump to bootstrap 3 and other changes