Refactoring and refining items-view.