More display-bug-fixing