Adding bootstrap files

Also a few minor formatting changes