Various improvements to list views
Merge branch 'master' into multiple_annotation