More display cleanups