Move XpandNavigationItem to base