Refactoring after review. Change logic with reuse items of listview.