More tweaks to aesthetics