some more styling
merge