Some more styling changes