More aesthetic improvements