This also changes headers to make section collapsible.

The model wasn't actually returning anything for some of it roles, so
sections didn't work...