Refactor item view