Refactored Item views and controller