Now group segments by country/state for easier navigation.