Update bootstrap
Major refactor of markup and styles