Refactor: more work on object display