Plant ListView improvements
Merge branch 'gerard'