Some more styling work