Improve structure of section template, and conditionally display correct
options for narratives/indicators