Revert "Revert "Version with remove udapter from listview""

This reverts commit d60bbc45fb2a5365066106311b12a524c76f3656.