General display cleanup