More aesthetic tweaks