Replacing ‘activity’ on budget type with this—they should come from a user’s role rather than the activity. Going with a generic name though so this can change over time.
Completes #2107