Massive aesthetic improvements