More display clean up