List view fixes