Refactored item elements