Update Bootstrap and other changes

 Untracked files: