Styling tweaks
Fixed merge conflicts