FFVI: Divergent Paths

I am at the point in Divergent Paths that I need to start working on the endings. This means I need to code endings for if you DON'T recruit the new characters in the World of Ruin. For all other characters, it shows their portrait over their hometown. For Leo, this creates a bit of a problem, as his hometown, Vector, doesn't exist in the World of Ruin. I'm wondering how I should handle it. Should I do Vector anyway? Zozo, where you recruit him in the WoR? Albrook, where you meet up with him in the WoB? Mobliz, since his storyline is tied with the wounded soldier? I'm a bit lost as to how to handle it.

The 16th character will share an ending with Umaro, and you will have to recruit both characters to see it. If you DON'T recruit them, should I keep it the same, with Umaro's face over Narshe, or change it to the 16th character?