Some more styling retouches