items preview refactoring