Further aesthetic tweaking