Reverted navitem refactor