Update: Refactor Items Tab