Further styling tweaks