ACF-65: List view refactorized