Many aesthetic tweaks