Cleaned up EntityItem view using @view_state model