Further work to list view