Clean up list view nav template
Updates #24255
Merge remote-tracking branch 'origin/cleanup/list-view-nav' into develop