Further aesthetic improvements