Update Bootstrap and other changes