A bit more styling tweaks