Couple of aesthetic tweaks