Minor aesthetic improvements