Display fixes + cleanup