formatting changes and including bootstrap