Issue #26424 - Completely splitting out List view into it's own template