More aesyhetic improvements