Styling - merged conflicts
Some more styling