clearer segues matching how I usually label

TODO: hook up custom template support!