resurrect indicator types
titlise
factor out common id
hack indicator categories back in
remove commented code
hack the per-indicator admin links back in