Refactored NavItem hash