Refactor items to be their own list and update code to reflect and display that