More work on country/program nav menu