More work on budget_templates