Segments not loading to Edge 25

I'm unable to get segment prompts working on my Edge 25.  I'm able to create both segments and courses in Connect.  My understanding is that if your segments are tagged as favorites then if they are contained in a course, uploading that course to your Edge will bring the segments.  I can't seem to get this to work.  I've created the courses from scratch and also converted activities (containing segments) to courses with no luck.  I'm uploading using Garmin Express so I don't think that's the problem.

I read that the Edge 25 isn't supposed to have a Segments folder and instead I should see the segments in the Course FIT file.  Has anyone seen these?  I see the following sections in the FIT files that I create.  Should there be a Segment section?

file_id 1 row(s)
course 1 row(s)
lap 1 row(s)
event 2 row(s)
record 2011 row(s)
course_point 7 row(s)