Added aesthetic tweaks