ListView: Refactoring
Bug fixing.
Merge TFS Changeset 1958