Major aesthetic improvements