fix bugs and used more bootstrap