Update and fix Bootstrap