Updating styling. Adding more info.
Fixed merge conflicts
Stylistic changes. Adding some content
Fixed merge conflicts