Some more styling fixes