Some styling changes
Merge dumb conflict