Updated list view to cleaner path logic