Updated list view WIP