Some more styling updates