- simplify the delegates (no more nested inner models/ListViews) - persist the "Arrange by" toggles state (when needed) - adjust the tests Fixes #13232