Refactored items views and controller