Updated list view & tests
Merge pull request #2041 from Bladrak/listView

Updated list view & tests