Fix list display
Squashed conflicts.