diff --git a/influence/helpers.py b/influence/helpers.py
index 5134e6c..c0d0a3d 100644
--- a/influence/helpers.py
+++ b/influence/helpers.py
@@ -7,6 +7,7 @@
 import datetime
 import googleanalytics
 import re
+from django.utils.datastructures import SortedDict
 
 def bar_validate(data):
     ''' take a dict formatted for submission to the barchart
@@ -136,7 +137,8 @@ def prepare_entity_view(request, entity_id, type):
     context['cycle'] = cycle
     context['entity_info'] = metadata['entity_info']
     context['entity_info']['metadata']['source_display_name'] = get_source_display_name(metadata['entity_info']['metadata'])
-    context['external_links'] = external_sites.get_contribution_links(type, standardized_name, metadata['entity_info']['external_ids'], cycle)
+    
+    context['sections'] = SortedDict()
 
     if cycle != DEFAULT_CYCLE and unicode(str(cycle)) in metadata['entity_info']['metadata']:
         # copy the current cycle's metadata into the generic metadata spot
diff --git a/influence/views.py b/influence/views.py
index 50db3fb..01393e0 100644
--- a/influence/views.py
+++ b/influence/views.py
@@ -164,30 +164,41 @@ def org_industry_entity(request, entity_id, type):
 
     if metadata['contributions']:
         amount = int(float(metadata['entity_info']['totals']['contributor_amount']))
-        org_contribution_section(entity_id, cycle, amount, type, context)
+        context['sections']['contributions'] = \
+            org_contribution_section(entity_id, standardized_name, cycle, amount, type, metadata['entity_info']['external_ids'])
 
     if metadata['lobbying']:
         is_lobbying_firm = bool(metadata['entity_info']['metadata'].get('lobbying_firm', False))
-        org_lobbying_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], is_lobbying_firm, context)
+        context['sections']['lobbying'] = \
+            org_lobbying_section(entity_id, standardized_name, cycle, type, metadata['entity_info']['external_ids'], is_lobbying_firm)
 
     if metadata['fed_spending']:
-        org_spending_section(entity_id, standardized_name, cycle, context)
+        context['sections']['federal_spending'] = \
+            org_spending_section(entity_id, standardized_name, cycle, metadata['entity_info']['totals'])
 
     if 'earmarks' in metadata and metadata['earmarks']:
-        org_earmarks_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], context)
+        context['sections']['earmarks'] = \
+            org_earmarks_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'])
 
     if 'contractor_misconduct' in metadata and metadata['contractor_misconduct']:
-        org_contractor_misconduct_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], context)
+        context['sections']['contractor_misconduct'] = \
+            org_contractor_misconduct_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'])
 
     if 'epa_echo' in metadata and metadata['epa_echo']:
-        org_epa_echo_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], context)
-
+        context['sections']['epa_echo'] = \
+            org_epa_echo_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], metadata['entity_info']['totals'])
+    
     return render_to_response('%s.html' % type, context,
                               entity_context(request, cycle, metadata['available_cycles']))
 
-def org_contribution_section(entity_id, cycle, amount, type, context):
+def org_contribution_section(entity_id, standardized_name, cycle, amount, type, external_ids):
+    section = {
+        'name': 'Campaign Finance',
+        'template': 'contributions.html',
+    }
+    
     if type == 'industry':
-        context['top_orgs'] = json.dumps([
+        section['top_orgs'] = json.dumps([
             {
                 'key': generate_label(standardize_organization_name(org['name'])),
                 'value': org['total_amount'],
@@ -197,7 +208,7 @@ def org_contribution_section(entity_id, cycle, amount, type, context):
             } for org in api.org.industry_orgs(entity_id, cycle, limit=10)
         ])
 
-    context['contributions_data'] = True
+    section['contributions_data'] = True
     recipients = api.org.recipients(entity_id, cycle=cycle)
 
     recipients_barchart_data = []
@@ -209,30 +220,30 @@ def org_contribution_section(entity_id, cycle, amount, type, context):
                 'value_pac' : record['direct_amount'],
                 'href' : barchart_href(record, cycle, entity_type='politician')
                 })
-    context['recipients_barchart_data'] = json.dumps(bar_validate(recipients_barchart_data))
+    section['recipients_barchart_data'] = json.dumps(bar_validate(recipients_barchart_data))
 
     party_breakdown = api.org.party_breakdown(entity_id, cycle)
     for key, values in party_breakdown.iteritems():
         party_breakdown[key] = float(values[1])
-    context['party_breakdown'] = json.dumps(pie_validate(party_breakdown))
+    section['party_breakdown'] = json.dumps(pie_validate(party_breakdown))
 
     level_breakdown = api.org.level_breakdown(entity_id, cycle)
     for key, values in level_breakdown.iteritems():
         level_breakdown[key] = float(values[1])
-    context['level_breakdown'] = json.dumps(pie_validate(level_breakdown))
+    section['level_breakdown'] = json.dumps(pie_validate(level_breakdown))
 
     # if none of the charts have data, or if the aggregate total
     # received was negative, then suppress that whole content
     # section except the overview bar
     if amount < 0:
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = "negative"
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = "negative"
 
-    elif (not context['recipients_barchart_data']
-          and not context['party_breakdown']
-          and not context['level_breakdown']):
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = 'empty'
+    elif (not section['recipients_barchart_data']
+          and not section['party_breakdown']
+          and not section['level_breakdown']):
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = 'empty'
 
     if cycle != DEFAULT_CYCLE:
 
@@ -243,78 +254,115 @@ def org_contribution_section(entity_id, cycle, amount, type, context):
     else:
         cut_off_at_step = 9999
 
-    context['cut_off_sparkline_at_step'] = cut_off_at_step
-    context['sparkline_data'] = json.dumps(api.org.sparkline_by_party(entity_id, cycle))
-
+    section['cut_off_sparkline_at_step'] = cut_off_at_step
+    section['sparkline_data'] = json.dumps(api.org.sparkline_by_party(entity_id, cycle))
+    
+    section['external_links'] = external_sites.get_contribution_links(type, standardized_name, external_ids, cycle)
+    
+    return section
 
 
-def org_lobbying_section(entity_id, name, cycle, external_ids, is_lobbying_firm, context):
-    context['lobbying_data'] = True
-    context['is_lobbying_firm'] = is_lobbying_firm
+def org_lobbying_section(entity_id, name, cycle, type, external_ids, is_lobbying_firm):
+    section = {
+        'name': 'Lobbying',
+        'template': '%s_lobbying.html' % ('org' if type == 'organization' else 'industry'),
+    }
+    
+    section['lobbying_data'] = True
+    section['is_lobbying_firm'] = is_lobbying_firm
 
     if is_lobbying_firm:
-        context['lobbying_clients']   = api.org.registrant_clients(entity_id, cycle)
-        context['lobbying_lobbyists'] = api.org.registrant_lobbyists(entity_id, cycle)
-        context['lobbying_issues']    =  [item['issue'] for item in
+        section['lobbying_clients']   = api.org.registrant_clients(entity_id, cycle)
+        section['lobbying_lobbyists'] = api.org.registrant_lobbyists(entity_id, cycle)
+        section['lobbying_issues']    =  [item['issue'] for item in
                                        api.org.registrant_issues(entity_id, cycle)]
-        context['lobbying_bills']     = [ {
+        section['lobbying_bills']     = [ {
             'bill': bill['bill_name'],
             'title': bill['title'],
             'link': make_bill_link(bill),
             'congress': bill['congress_no'],
         } for bill in api.org.registrant_bills(entity_id, cycle) ]
-        context['lobbying_links'] = external_sites.get_lobbying_links('firm', name, external_ids, cycle)
+        section['lobbying_links'] = external_sites.get_lobbying_links('firm', name, external_ids, cycle)
     else:
-        context['lobbying_clients']   = api.org.registrants(entity_id, cycle)
-        context['lobbying_lobbyists'] = api.org.lobbyists(entity_id, cycle)
-        context['lobbying_issues']    =  [item['issue'] for item in api.org.issues(entity_id, cycle)]
-        context['lobbying_bills']     = [ {
+        section['lobbying_clients']   = api.org.registrants(entity_id, cycle)
+        section['lobbying_lobbyists'] = api.org.lobbyists(entity_id, cycle)
+        section['lobbying_issues']    =  [item['issue'] for item in api.org.issues(entity_id, cycle)]
+        section['lobbying_bills']     = [ {
             'bill': bill['bill_name'],
             'title': bill['title'],
             'link': make_bill_link(bill),
             'congress': bill['congress_no'],
         } for bill in api.org.bills(entity_id, cycle) ]
 
-        context['lobbying_links'] = external_sites.get_lobbying_links('industry' if type == 'industry' else 'client', name, external_ids, cycle)
-
-    context['lobbyist_registration_tracker'] = external_sites.get_lobbyist_tracker_data(external_ids)
-
-
-def org_earmarks_section(entity_id, name, cycle, external_ids, context):
-    context['earmarks'] = earmarks_table_data(entity_id, cycle)
-    context['earmark_links'] = external_sites.get_earmark_links('organization', name, external_ids, cycle)
-
-
-def org_contractor_misconduct_section(entity_id, name, cycle, external_ids, context):
-    context['contractor_misconduct'] = api.org.contractor_misconduct(entity_id, cycle)
-    context['pogo_links'] = external_sites.get_pogo_links(external_ids, name, cycle)
-
-
-def org_epa_echo_section(entity_id, name, cycle, external_ids, context):
-    context['epa_echo'] = api.org.epa_echo(entity_id, cycle)
-
-    context['epa_found_things'] = context['entity_info']['totals']['epa_actions_count']
-    context['epa_links'] = external_sites.get_epa_links(name, cycle)
-
-
-def org_spending_section(entity_id, name, cycle, context):
+        section['lobbying_links'] = external_sites.get_lobbying_links('industry' if type == 'industry' else 'client', name, external_ids, cycle)
+
+    section['lobbyist_registration_tracker'] = external_sites.get_lobbyist_tracker_data(external_ids)
+    
+    print section
+    return section
+
+def org_earmarks_section(entity_id, name, cycle, external_ids):
+    section = {
+        'name': 'Earmarks',
+        'template': 'org_earmarks.html',
+    }
+    
+    section['earmarks'] = earmarks_table_data(entity_id, cycle)
+    section['earmark_links'] = external_sites.get_earmark_links('organization', name, external_ids, cycle)
+    
+    return section
+
+def org_contractor_misconduct_section(entity_id, name, cycle, external_ids):
+    section = {
+        'name': 'Contractor Misconduct',
+        'template': 'org_contractor_misconduct.html',
+    }
+    
+    section['contractor_misconduct'] = api.org.contractor_misconduct(entity_id, cycle)
+    section['pogo_links'] = external_sites.get_pogo_links(external_ids, name, cycle)
+    
+    return section
+
+
+def org_epa_echo_section(entity_id, name, cycle, external_ids, totals):
+    section = {
+        'name': 'EPA Violations',
+        'template': 'org_epa_echo.html',
+    }
+    
+    section['epa_echo'] = api.org.epa_echo(entity_id, cycle)
+
+    section['epa_found_things'] = totals['epa_actions_count']
+    section['epa_links'] = external_sites.get_epa_links(name, cycle)
+    
+    return section
+
+
+def org_spending_section(entity_id, name, cycle, totals):
+    section = {
+        'name': 'Federal Spending',
+        'template': 'org_grants_and_contracts.html',
+    }
+    
     spending = api.org.fed_spending(entity_id, cycle)
 
     filter_bad_spending_descriptions(spending)
 
-    context['grants_and_contracts'] = spending
-    context['gc_links'] = external_sites.get_gc_links(name, cycle)
+    section['grants_and_contracts'] = spending
+    section['gc_links'] = external_sites.get_gc_links(name, cycle)
 
     gc_found_things = []
     for gc_type in ['grant', 'contract', 'loan']:
-        if context['entity_info']['totals'].get('%s_count' % gc_type, 0):
+        if totals.get('%s_count' % gc_type, 0):
             gc_found_things.append('%s %s%s' % (
-                intcomma(context['entity_info']['totals']['%s_count' % gc_type]),
+                intcomma(totals['%s_count' % gc_type]),
                 gc_type,
-                pluralize(context['entity_info']['totals']['%s_count' % gc_type])
+                pluralize(totals['%s_count' % gc_type])
             ))
 
-    context['gc_found_things'] = gc_found_things
+    section['gc_found_things'] = gc_found_things
+    
+    return section
 
 
 def organization_entity(request, entity_id):
@@ -350,25 +398,30 @@ def politician_entity(request, entity_id):
 
     if metadata['contributions']:
         amount = int(float(metadata['entity_info']['totals']['recipient_amount']))
-        pol_contribution_section(entity_id, cycle, amount, context)
+        context['sections']['contributions'] = \
+            pol_contribution_section(entity_id, standardized_name, cycle, amount, metadata['entity_info']['external_ids'])
 
     if metadata['earmarks']:
-        pol_earmarks_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], context)
-
-    context['partytime_link'], context['partytime_data'] = external_sites.get_partytime_data(metadata['entity_info']['external_ids'])
+        context['sections']['earmarks'] = \
+            pol_earmarks_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'])
 
     return render_to_response('politician.html', context,
                               entity_context(request, cycle, metadata['available_cycles']))
 
 
-def pol_contribution_section(entity_id, cycle, amount, context):
-    context['contributions_data'] = True
+def pol_contribution_section(entity_id, standardized_name, cycle, amount, external_ids):
+    section = {
+        'name': 'Campaign Finance',
+        'template': 'contributions.html',
+    }
+    
+    section['contributions_data'] = True
 
     top_contributors = api.pol.contributors(entity_id, cycle)
     top_industries = api.pol.industries(entity_id, cycle=cycle)
     industries_unknown_amount = api.pol.industries_unknown(entity_id, cycle=cycle).get('amount', 0)
     pct_unknown = float(industries_unknown_amount) * 100 / amount
-    context['pct_known'] = int(round(100 - pct_unknown))
+    section['pct_known'] = int(round(100 - pct_unknown))
 
     contributors_barchart_data = []
     for record in top_contributors:
@@ -379,7 +432,7 @@ def pol_contribution_section(entity_id, cycle, amount, context):
             'value_pac' : record['direct_amount'],
             'href' : barchart_href(record, cycle, 'organization')
         })
-    context['contributors_barchart_data'] = json.dumps(bar_validate(contributors_barchart_data))
+    section['contributors_barchart_data'] = json.dumps(bar_validate(contributors_barchart_data))
 
     industries_barchart_data = []
     for record in top_industries:
@@ -388,35 +441,41 @@ def pol_contribution_section(entity_id, cycle, amount, context):
             'href': barchart_href(record, cycle, 'industry'),
             'value' : record['amount'],
         })
-    context['industries_barchart_data'] = json.dumps(bar_validate(industries_barchart_data))
+    section['industries_barchart_data'] = json.dumps(bar_validate(industries_barchart_data))
 
     local_breakdown = api.pol.local_breakdown(entity_id, cycle)
     for key, values in local_breakdown.iteritems():
         # values is a list of [count, amount]
         local_breakdown[key] = float(values[1])
-    context['local_breakdown'] = json.dumps(pie_validate(local_breakdown))
+    section['local_breakdown'] = json.dumps(pie_validate(local_breakdown))
 
     entity_breakdown = api.pol.contributor_type_breakdown(entity_id, cycle)
     for key, values in entity_breakdown.iteritems():
         # values is a list of [count, amount]
         entity_breakdown[key] = float(values[1])
-    context['entity_breakdown'] = json.dumps(pie_validate(entity_breakdown))
+    section['entity_breakdown'] = json.dumps(pie_validate(entity_breakdown))
 
     # if none of the charts have data, or if the aggregate total
     # received was negative, then suppress that whole content
     # section except the overview bar
     if amount < 0:
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = "negative"
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = "negative"
 
-    elif (not context['industries_barchart_data']
-        and not context['contributors_barchart_data']
-        and not context['local_breakdown']
-        and not context['entity_breakdown']):
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = 'empty'
+    elif (not section['industries_barchart_data']
+        and not section['contributors_barchart_data']
+        and not section['local_breakdown']
+        and not section['entity_breakdown']):
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = 'empty'
 
-    context['sparkline_data'] = json.dumps(api.pol.sparkline(entity_id, cycle))
+    section['sparkline_data'] = json.dumps(api.pol.sparkline(entity_id, cycle))
+    
+    section['partytime_link'], section['partytime_data'] = external_sites.get_partytime_data(external_ids)
+    
+    section['external_links'] = external_sites.get_contribution_links('politician', standardized_name, external_ids, cycle)
+    
+    return section
 
 
 def earmarks_table_data(entity_id, cycle):
@@ -428,16 +487,23 @@ def earmarks_table_data(entity_id, cycle):
     return rows
 
 
-def pol_earmarks_section(entity_id, name, cycle, external_ids, context):
-    context['earmarks'] = earmarks_table_data(entity_id, cycle)
+def pol_earmarks_section(entity_id, name, cycle, external_ids):
+    section = {
+        'name': 'Earmarks',
+        'template': 'pol_earmarks.html',
+    }
+    
+    section['earmarks'] = earmarks_table_data(entity_id, cycle)
 
     local_breakdown = api.pol.earmarks_local_breakdown(entity_id, cycle)
     local_breakdown = dict([(key, float(value[1])) for key, value in local_breakdown.iteritems()])
 
-    context['earmark_links'] = external_sites.get_earmark_links('politician', name, external_ids, cycle)
+    section['earmark_links'] = external_sites.get_earmark_links('politician', name, external_ids, cycle)
 
     ordered_pie = SortedDict([(key, local_breakdown.get(key, 0)) for key in ['unknown', 'in-state', 'out-of-state']])
-    context['earmarks_local'] = json.dumps(pie_validate(ordered_pie))
+    section['earmarks_local'] = json.dumps(pie_validate(ordered_pie))
+    
+    return section
 
 
 @handle_errors
@@ -446,17 +512,24 @@ def individual_entity(request, entity_id):
 
     if metadata['contributions']:
         amount = int(float(metadata['entity_info']['totals']['contributor_amount']))
-        indiv_contribution_section(entity_id, cycle, amount, context)
+        context['sections']['contributions'] = \
+            indiv_contribution_section(entity_id, standardized_name, cycle, amount, metadata['entity_info']['external_ids'])
 
     if metadata['lobbying']:
-        indiv_lobbying_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'], context)
+        context['sections']['lobbying'] = \
+            indiv_lobbying_section(entity_id, standardized_name, cycle, metadata['entity_info']['external_ids'])
 
     return render_to_response('individual.html', context,
                               entity_context(request, cycle, metadata['available_cycles']))
 
 
-def indiv_contribution_section(entity_id, cycle, amount, context):
-    context['contributions_data'] = True
+def indiv_contribution_section(entity_id, standardized_name, cycle, amount, external_ids):
+    section = {
+        'name': 'Campaign Finance',
+        'template': 'contributions.html',
+    }
+    
+    section['contributions_data'] = True
     recipient_candidates = api.indiv.pol_recipients(entity_id, cycle)
     recipient_orgs = api.indiv.org_recipients(entity_id, cycle)
 
@@ -467,7 +540,7 @@ def indiv_contribution_section(entity_id, cycle, amount, context):
                 'value' : record['amount'],
                 'href' : barchart_href(record, cycle, entity_type="politician"),
                 })
-    context['candidates_barchart_data'] = json.dumps(bar_validate(candidates_barchart_data))
+    section['candidates_barchart_data'] = json.dumps(bar_validate(candidates_barchart_data))
 
     orgs_barchart_data = []
     for record in recipient_orgs:
@@ -476,34 +549,45 @@ def indiv_contribution_section(entity_id, cycle, amount, context):
                 'value' : record['amount'],
                 'href' : barchart_href(record, cycle, entity_type="organization"),
                 })
-    context['orgs_barchart_data'] = json.dumps(bar_validate(orgs_barchart_data))
+    section['orgs_barchart_data'] = json.dumps(bar_validate(orgs_barchart_data))
 
     party_breakdown = api.indiv.party_breakdown(entity_id, cycle)
     for key, values in party_breakdown.iteritems():
         party_breakdown[key] = float(values[1])
-    context['party_breakdown'] = json.dumps(pie_validate(party_breakdown))
+    section['party_breakdown'] = json.dumps(pie_validate(party_breakdown))
 
-    context['sparkline_data'] = json.dumps(api.indiv.sparkline(entity_id, cycle))
+    section['sparkline_data'] = json.dumps(api.indiv.sparkline(entity_id, cycle))
 
     # if none of the charts have data, or if the aggregate total
     # received was negative, then suppress that whole content
     # section except the overview bar
     if amount < 0:
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = "negative"
-
-    elif (not context['candidates_barchart_data']
-        and not context['orgs_barchart_data']
-        and not context['party_breakdown']):
-        context['suppress_contrib_graphs'] = True
-        context['reason'] = 'empty'
-
-
-def indiv_lobbying_section(entity_id, name, cycle, external_ids, context):
-    context['lobbying_data'] = True
-    context['lobbying_with_firm'] = api.indiv.registrants(entity_id, cycle)
-    context['issues_lobbied_for'] =  [item['issue'] for item in api.indiv.issues(entity_id, cycle)]
-    context['lobbying_for_clients'] = api.indiv.clients(entity_id, cycle)
-    context['lobbying_links'] = external_sites.get_lobbying_links('lobbyist', name, external_ids, cycle)
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = "negative"
+
+    elif (not section['candidates_barchart_data']
+        and not section['orgs_barchart_data']
+        and not section['party_breakdown']):
+        section['suppress_contrib_graphs'] = True
+        section['reason'] = 'empty'
+    
+    section['external_links'] = external_sites.get_contribution_links('individual', standardized_name, external_ids, cycle)
+    
+    return section
+
+
+def indiv_lobbying_section(entity_id, name, cycle, external_ids):
+    section = {
+        'name': 'Lobbying',
+        'template': 'indiv_lobbying.html',
+    }
+    
+    section['lobbying_data'] = True
+    section['lobbying_with_firm'] = api.indiv.registrants(entity_id, cycle)
+    section['issues_lobbied_for'] =  [item['issue'] for item in api.indiv.issues(entity_id, cycle)]
+    section['lobbying_for_clients'] = api.indiv.clients(entity_id, cycle)
+    section['lobbying_links'] = external_sites.get_lobbying_links('lobbyist', name, external_ids, cycle)
+    
+    return section
 
 
diff --git a/templates/contributions.html b/templates/contributions.html
index 4c029fb..04aea77 100644
--- a/templates/contributions.html
+++ b/templates/contributions.html
@@ -4,10 +4,10 @@
 {% load humanize %}
 
 <div class="overviewBar">
-  {% if not suppress_contrib_graphs %}
+  {% if not section.suppress_contrib_graphs %}
   <a class="toggle">Toggle</a>
   {% endif %}
-  <h3 class="insideBar">Contributions, 
+  <h3 class="insideBar">Campaign Finance, 
       {% ifequal cycle "-1" %} 
           {{entity_info.camp_fin_years.start|add:-1}} &#150; {{entity_info.camp_fin_years.end}}
         {% else %}  
@@ -51,18 +51,18 @@ <h3 class="insideBar">Contributions,
 
   {% block charts %}   
   
-  {% if not suppress_contrib_graphs %}
+  {% if not section.suppress_contrib_graphs %}
     {% if entity_info.type == "individual" %}
-    {% include "indiv_charts.html" %}
+    {% include "indiv_contributions.html" %}
     {% else %}{% if entity_info.type == "politician" %}
-    {% include "pol_charts.html" %}
+    {% include "pol_contributions.html" %}
     {% else %}{% if entity_info.type == "organization" %}
-    {% include "org_charts.html" %}
+    {% include "org_contributions.html" %}
     {% else %}{% if entity_info.type == "industry" %}
-    {% include "industry_charts.html" %}
+    {% include "industry_contributions.html" %}
     {% endif %}{% endif %}{% endif %}{% endif %}
   {% else %}
-  {% if reason == "negative" %}
+  {% if section.reason == "negative" %}
   <p>Due to refunds and other accounting issues, aggregate totals
   for this time frame were negative.</p>  
   {% endif %}
@@ -73,12 +73,12 @@ <h3 class="insideBar">Contributions,
   <div class="clear"></div>
   
   <div class="external">
-    {% if external_links or partytime_link %}
+    {% if section.external_links or section.partytime_link %}
     For more information on contributions:
-    {% for link in external_links %}
+    {% for link in section.external_links %}
     <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
     {% endfor %}
-    {% if partytime_link %}<a href="{{ partytime_link }}" class="external" target="_blank">Party Time</a>{% endif %}
+    {% if section.partytime_link %}<a href="{{ section.partytime_link }}" class="external" target="_blank">Party Time</a>{% endif %}
     {% endif %}
   </div>
   
diff --git a/templates/entity_base.html b/templates/entity_base.html
index 140a4f8..fefdb88 100644
--- a/templates/entity_base.html
+++ b/templates/entity_base.html
@@ -1,5 +1,15 @@
 {% extends "search_base.html" %}
 
+{% load influence_extras %}
+
+{% block pagetopics %}: {% spaceless %}
+    {% filter nonempty_lines|pretty_list %}
+        {% for section in sections.values %}
+            {{ section.name }}
+        {% endfor %}
+    {% endfilter %}
+{% endspaceless %}{% endblock %}
+
 {% block js %}
 {% block extrajs %}
 <!-- extrajs is where the charts are loaded and must go *before* the --
@@ -22,16 +32,15 @@
   {% block description %}
   {% endblock %}
 </div>
+{% if sections.keys|length > 1 %}
 <div id="miniNav" class="withBg">
     <ul>
-        {% if contributions_data %}<li><a href="#contributions">Contributions</a></li>{% endif %}
-        {% if lobbying_data %}<li><a href="#lobbying">Lobbying</a></li>{% endif %}
-        {% if earmarks %}<li><a href="#earmarks">Earmarks</a></li>{% endif %}
-        {% if grants_and_contracts %}<li><a href="#federal_spending">Federal Spending</a></li>{% endif %}
-        {% if contractor_misconduct %}<li><a href="#contractor_misconduct">Contractor Misconduct</a></li>{% endif %}
-        {% if epa_echo %}<li><a href="#epa_echo">EPA Violations</a></li>{% endif %}
+        {% for section_id, section in sections.items %}
+            <li><a href="#{{ section_id }}">{{ section.name }}</a></li>
+        {% endfor %}
     </ul>
 </div>
+{% endif %}
 <div class="clear"></div>
 
 <div class="module" id="timeSpan">
@@ -57,28 +66,11 @@
   {% endblock %}
 </div>
 
-{% block contributions %}
-<a name="contributions"></a>
-{% endblock %}
-
-{% block lobbying %}
-<a name="lobbying"></a>
-{% endblock %}
-
-{% block earmarks %}
-<a name="earmarks"></a>
-{% endblock %}
-
-{% block grants_and_contracts %}
-<a name="federal_spending"></a>
-{% endblock %}
-
-{% block contractor_misconduct %}
-<a name="contractor_misconduct"></a>
-{% endblock %}
-
-{% block epa_echo %}
-<a name="epa_echo"></a>
+{% block sections %}
+{% for section_id, section in sections.items %}
+	<a name={{ section_id }}></a>
+	{% include section.template with section=section section_id=section_id %}
+{% endfor %}
 {% endblock %}
 
 {% endblock %}<!-- end main -->
diff --git a/templates/indiv_charts.html b/templates/indiv_contributions.html
similarity index 84%
rename from templates/indiv_charts.html
rename to templates/indiv_contributions.html
index ceac178..71316fc 100644
--- a/templates/indiv_charts.html
+++ b/templates/indiv_contributions.html
@@ -1,7 +1,7 @@
 
 <div class="twoColumn chartWrapper"> 
   <div class="chart"> 
-    {% if candidates_barchart_data %}
+    {% if section.candidates_barchart_data %}
     <h4 class="withTip">Top Politicians</h4>
     <div class="graph" id="recipients_barchart">
       <!-- raphael charts here -->
@@ -22,10 +22,10 @@ <h4 class="withTip">Republicans vs. Democrats</h4>
 
 <div class="clear"></div> <!-- start a new row -->
 
-{% if orgs_barchart_data and orgs_barchart_data != "[]" %}
+{% if section.orgs_barchart_data and section.orgs_barchart_data != "[]" %}
 <div class="twoColumn chartWrapper">
   <div class="chart">
-    {% if orgs_barchart_data %}
+    {% if section.orgs_barchart_data %}
     <h4 class="withTip">Top Organizations</h4>
     <div class="graph" id="orgs_barchart">
       <!-- raphael charts here -->
diff --git a/templates/indiv_lobbying.html b/templates/indiv_lobbying.html
index 50ff01b..8d503ae 100644
--- a/templates/indiv_lobbying.html
+++ b/templates/indiv_lobbying.html
@@ -16,12 +16,12 @@ <h3 class="insideBar">
 </div>
 
 <div class="chartModule">  
-    {% if lobbying_with_firm %}
+    {% if section.lobbying_with_firm %}
         <h4>Lobbying by {{ entity_info.name|standardize_individual_name }}</h4>
         
         <div class="twoColumn chartWrapper">
             <h5>Lobbied with the Following Firms</h5>
-            {% for row in lobbying_with_firm %}
+            {% for row in section.lobbying_with_firm %}
             {% if row.registrant_entity %}    
             <a href="/organization/{{ row.registrant_name|slugify }}/{{ row.registrant_entity }}{{cycle|pretty_cycle}}">{{ row.registrant_name }}</a>{% if forloop.last %}{% else %},{% endif %}
             {% else %}
@@ -30,11 +30,11 @@ <h5>Lobbied with the Following Firms</h5>
             {% endfor %}
         </div>
         
-        {% if issues_lobbied_for %}
+        {% if section.issues_lobbied_for %}
             <div class="issuesLobbied oneColumn chartWrapper">
 	            <h5>Most Frequently Disclosed Lobbying Issues</h5>
 	            <ul>
-	                {% for issue in issues_lobbied_for %}
+	                {% for issue in section.issues_lobbied_for %}
 	                <li>{{issue}}{% if forloop.last %}{% else %},{% endif %}</li>
 	                {% endfor %}
 	            </ul>
@@ -44,10 +44,10 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
   
     {% endif %} <!-- end if lobbying with firm -->
   
-    {% if lobbying_for_clients %}
+    {% if section.lobbying_for_clients %}
         <div class="twoColumn chartWrapper">
             <h5>Clients of Firms {{ entity_info.name|standardize_individual_name }} Worked For</h5>
-            {% for row in lobbying_for_clients %}
+            {% for row in section.lobbying_for_clients %}
             {% if row.client_entity %}
             <a href="/organization/{{ row.client_name|slugify }}/{{ row.client_entity }}{{cycle|pretty_cycle}}">{{ row.client_name }}</a>{% if forloop.last %}{% else %},{% endif %}
             {% else %}
@@ -59,9 +59,9 @@ <h5>Clients of Firms {{ entity_info.name|standardize_individual_name }} Worked F
     <div class="clear"></div>
 
     <div class="external">
-        {% if lobbying_links %}
+        {% if section.lobbying_links %}
             For more information on lobbying:
-            {% for link in lobbying_links %}
+            {% for link in section.lobbying_links %}
             <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
             {% endfor %}
         {% endif %}
diff --git a/templates/individual.html b/templates/individual.html
index 9da0c17..5c5edfd 100644
--- a/templates/individual.html
+++ b/templates/individual.html
@@ -6,13 +6,6 @@
     {{ entity_info.name|standardize_individual_name }} | 
 {% endblock %}
 
-{% block pagetopics %}: {% spaceless %}
-    {% filter nonempty_lines|pretty_list %}
-        {% if contributions_data %}Campaign Contributions{% endif %}
-        {% if lobbying_data %}Lobbying{% endif %}
-    {% endfilter %}
-{% endspaceless %}{% endblock %}
-
 {% block canonicalurl %}/individual/{{ entity_info.name|standardize_individual_name|slugify }}/{{ entity_info.id }}{{cycle|pretty_cycle}}{% endblock %}
 
 {% block metadesc %}{{ entity_info.name|standardize_individual_name }} has given ${{entity_info.totals.contributor_amount|floatformat:0|intcomma }} in campaign contributions from {% ifequal cycle "-1" %}{{entity_info.camp_fin_years.start|add:-1}} to {{entity_info.camp_fin_years.end}}{% else %}{{cycle|add:-1}} to {{cycle}}{% endifequal %}. See where the money went on Influence Explorer.{% endblock %}
@@ -32,11 +25,11 @@
 {% block extrajs %}
 <script type="text/javascript" charset="utf-8"> 
 $(document).ready(function() {
-  sparkline("sparklines", {% if sparkline_data %}{{ sparkline_data|safe }}{% else %}[]{% endif %});
+  sparkline("sparklines", {% if sections.contributions.sparkline_data %}{{ sections.contributions.sparkline_data|safe }}{% else %}[]{% endif %});
   {% if not suppress_contrib_graphs %}
-  piechart("piechart_party", {% if party_breakdown %}{{ party_breakdown|safe }}{% else %}{}{% endif %}, type="party");
-  barchart("recipients_barchart", {% if candidates_barchart_data %}{{ candidates_barchart_data|safe }}{% else %} [] {% endif %});  
-  barchart("orgs_barchart", {% if orgs_barchart_data %}{{ orgs_barchart_data|safe }}{% else %} [] {% endif %});
+  piechart("piechart_party", {% if sections.contributions.party_breakdown %}{{ sections.contributions.party_breakdown|safe }}{% else %}{}{% endif %}, type="party");
+  barchart("recipients_barchart", {% if sections.contributions.candidates_barchart_data %}{{ sections.contributions.candidates_barchart_data|safe }}{% else %} [] {% endif %});  
+  barchart("orgs_barchart", {% if sections.contributions.orgs_barchart_data %}{{ sections.contributions.orgs_barchart_data|safe }}{% else %} [] {% endif %});
   {% endif %}
 });
 
@@ -55,8 +48,8 @@ <h2 class="individualName">{{ entity_info.name|standardize_individual_name }}</h
     <div class="descriptorText" id="individualDescriptor">
 		<p>We rely on our partner organizations, the <a href="http://www.opensecrets.org/">Center for Responsive Politics</a> and the <a href="http://www.followthemoney.org/">National Institute on Money in State Politics</a>, to uniquely identify individuals' campaign finance and lobbying activity. If data appears to be missing, it may be that they have not identified all influence activity for this individual. If the data is completely different than you expected, it may be that you're looking at a different person with the same name.</p>
 		<p>In these cases, we suggest using our companion site, <a href="http://transparencydata.com">TransparencyData.com</a>, to search the underlying databases. TransparencyData provides extra information about each contribution, such as the donor's city, state and employer.  This information should allow you to judge for yourself if the contribution came from the person for whom you searched.</p>
-		{% if external_links %}
-    	    {% for link in external_links %}
+		{% if sections.contributions.external_links %}
+    	    {% for link in sections.contributions.external_links %}
     	    	{% if link.text == "TransparencyData.com" %}
     				<p><a href="{{ link.url }}" class="external" target="_blank">Click here for campaign contributions with the name "{{ entity_info.name|standardize_individual_name }}".</a></p>
     	    	{% endif %}
@@ -88,17 +81,3 @@ <h2 class="individualName">{{ entity_info.name|standardize_individual_name }}</h
   {% endif %} 
   
 {% endblock %}
-
-{% block contributions %}
-{% if contributions_data %}
-{{ block.super }}
-{% include "contributions.html" %}
-{% endif %}
-{% endblock %}
-
-{% block lobbying %}
-{% if lobbying_data %}
-{{ block.super }}
-{% include "indiv_lobbying.html" %}
-{% endif %}
-{% endblock %}
diff --git a/templates/industry.html b/templates/industry.html
index d41243c..95eb9dd 100644
--- a/templates/industry.html
+++ b/templates/industry.html
@@ -7,13 +7,6 @@
     {{ entity_info.name|standardize_industry_name}} | 
 {% endblock %}
 
-{% block pagetopics %}: {% spaceless %}
-    {% filter nonempty_lines|pretty_list %}
-        {% if contributions_data %}Campaign Contributions{% endif %}
-		{% if lobbying_data %}Lobbying{% endif %}
-    {% endfilter %}
-{% endspaceless %}{% endblock %}
-
 {% block canonicalurl %}/industry/{{ entity_info.name|standardize_industry_name|slugify }}/{{ entity_info.id }}{{cycle|pretty_cycle}}{% endblock %}
 
 {% block metadesc %}{{ entity_info.name|standardize_industry_name }} has given ${{entity_info.totals.contributor_amount|floatformat:0|intcomma }} in campaign contributions from {% ifequal cycle "-1" %}{{entity_info.camp_fin_years.start|add:-1}} to {{entity_info.camp_fin_years.end}}{% else %}{{cycle|add:-1}} to {{cycle}}{% endifequal %}. See where the money went on Influence Explorer.{% endblock %}
@@ -31,12 +24,12 @@
 {% block extrajs %}
 <script type="text/javascript" charset="utf-8">
 $(document).ready(function() {
-  sparkline_by_party("sparklines", {% if sparkline_data %}{{ sparkline_data|safe }}, {{ cut_off_sparkline_at_step }} {% else %}[], 0{% endif %});
-  {% if not suppress_contrib_graphs %}
-  piechart("piechart_level", {% if level_breakdown %}{{ level_breakdown|safe }}{% else %}{}{% endif %});
-  piechart("piechart_party", {% if party_breakdown %}{{ party_breakdown|safe }}{% else %}{}{% endif %}, type="party" );
-  barchart("recipients_barchart", {% if recipients_barchart_data %}{{ recipients_barchart_data|safe }} {% else %} [] {% endif %});
-  barchart("organizations_barchart", {% if top_orgs %}{{ top_orgs|safe }} {% else %} [] {% endif %});
+  sparkline_by_party("sparklines", {% if sections.contributions.sparkline_data %}{{ sections.contributions.sparkline_data|safe }}, {{ sections.contributions.cut_off_sparkline_at_step }} {% else %}[], 0{% endif %});
+  {% if not sections.contributions.suppress_contrib_graphs %}
+  piechart("piechart_level", {% if sections.contributions.level_breakdown %}{{ sections.contributions.level_breakdown|safe }}{% else %}{}{% endif %});
+  piechart("piechart_party", {% if sections.contributions.party_breakdown %}{{ sections.contributions.party_breakdown|safe }}{% else %}{}{% endif %}, type="party" );
+  barchart("recipients_barchart", {% if sections.contributions.recipients_barchart_data %}{{ sections.contributions.recipients_barchart_data|safe }} {% else %} [] {% endif %});
+  barchart("organizations_barchart", {% if sections.contributions.top_orgs %}{{ sections.contributions.top_orgs|safe }} {% else %} [] {% endif %});
   {% endif %}
 });
 </script>
@@ -72,18 +65,3 @@ <h2>{{ entity_info.name|standardize_industry_name }}</h2>
 {% endif %}
 {% endblock %}
 {% endif %}
-
-
-{% block contributions %}
-{% if contributions_data %}
-    {{ block.super }}
-    {% include "contributions.html" %}
-{% endif %}
-{% endblock %}
-
-{% block lobbying %}
-{% if lobbying_data %}
-    {{ block.super }}
-    {% include "industry_lobbying.html" %}
-{% endif %}
-{% endblock %}
diff --git a/templates/industry_charts.html b/templates/industry_contributions.html
similarity index 95%
rename from templates/industry_charts.html
rename to templates/industry_contributions.html
index 150bebf..d6c59f2 100644
--- a/templates/industry_charts.html
+++ b/templates/industry_contributions.html
@@ -1,6 +1,6 @@
 <div class="twoColumn chartWrapper">
   <div class="chart">
-    {% if recipients_barchart_data %}
+    {% if section.recipients_barchart_data %}
     <h4 class="key withTip">Top Organizations</h4>
     <dl class="key">
         <dt class="employees">Employee Color Block</dt>
@@ -30,7 +30,7 @@ <h4 class="withTip">Republicans vs. Democrats</h4>
 
 <div class="twoColumn chartWrapper">
   <div class="chart">
-    {% if recipients_barchart_data %}
+    {% if section.recipients_barchart_data %}
     <h4 class="key withTip">Top Recipients</h4>
     <dl class="key">
         <dt class="employees">Employee Color Block</dt>
diff --git a/templates/industry_lobbying.html b/templates/industry_lobbying.html
index f9f2637..7713885 100644
--- a/templates/industry_lobbying.html
+++ b/templates/industry_lobbying.html
@@ -14,7 +14,7 @@ <h3 class="insideBar">Lobbying,
     </h3>
     <div class="insideBar amount">
         <span class="amount">
-            {% if is_lobbying_firm %} 
+            {% if section.is_lobbying_firm %} 
         	    {% if entity_info.totals.firm_income %}
         	    	${{ entity_info.totals.firm_income|floatformat:0|intcomma }} Income
         	    {% endif %}
@@ -41,14 +41,14 @@ <h3 class="insideBar">Lobbying,
 
 
 <div class="chartModule">
-    {% if is_lobbying_firm %}
+    {% if section.is_lobbying_firm %}
         <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
         <div class="lobbyingColumn oneColumn chartWrapper">
-            {% if lobbying_lobbyists %}
+            {% if section.lobbying_lobbyists %}
                 <div class="lobbyistsOrgs">
                     <span class="secondaryTitle">Lobbyists Employed:</span>
                     <ul>
-                        {% for row in lobbying_lobbyists %}
+                        {% for row in section.lobbying_lobbyists %}
                         {% if row.lobbyist_entity %}
                         <li>
                             <a href="/individual/{{ row.lobbyist_name|standardize_individual_name|slugify }}/{{ row.lobbyist_entity }}{{cycle|pretty_cycle}}">{{ row.lobbyist_name|standardize_individual_name }}</a>,
@@ -62,11 +62,11 @@ <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
                 </div>
             {% endif %}
       
-            {% if lobbying_issues %}
+            {% if section.lobbying_issues %}
                 <div class="issuesLobbied">
                     <span class="secondaryTitle">Most Frequently Disclosed Lobbying Issues:</span>  
                     <ul> 
-                        {% for issue in lobbying_issues %}
+                        {% for issue in section.lobbying_issues %}
                         <li>
                             {{issue}}{% if forloop.last %}{% else %},{% endif %}
                         </li>
@@ -76,7 +76,7 @@ <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
             {% endif %}
         </div>
 
-        {% if lobbying_clients %}
+        {% if section.lobbying_clients %}
         <div class="twoColumn chartWrapper">
             <table class="twoColumn">
                 <thead>
@@ -86,7 +86,7 @@ <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
                     </tr>
                 </thead>
                 <tbody>
-                    {% for row in lobbying_clients %}
+                    {% for row in section.lobbying_clients %}
                     <tr class="{% cycle 'even' 'odd' %}">
                         <td>	    
                             {% if row.client_entity %}
@@ -106,11 +106,11 @@ <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
     {% else %}    
         <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
         <div class="lobbyingColumn oneColumn chartWrapper">
-            {% if lobbying_lobbyists %}
+            {% if section.lobbying_lobbyists %}
             <div class="lobbyistsOrgs">
                 <span class="secondaryTitle">Names of Lobbyists:</span>
                 <ul>
-                    {% for row in lobbying_lobbyists %}
+                    {% for row in section.lobbying_lobbyists %}
                     {% if row.lobbyist_entity %}
                     <li>
                         <a href="/individual/{{ row.lobbyist_name|standardize_individual_name|slugify }}/{{ row.lobbyist_entity }}{{cycle|pretty_cycle}}">{{ row.lobbyist_name|standardize_individual_name }}</a>,
@@ -124,11 +124,11 @@ <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
             </div>
             {% endif %}
             
-            {% if lobbying_issues %}
+            {% if section.lobbying_issues %}
             <div class="issuesLobbied">
                 <span class="secondaryTitle">Most Frequently Disclosed Lobbying Issues:</span>
                 <ul>
-                    {% for issue in lobbying_issues %}
+                    {% for issue in section.lobbying_issues %}
                     <li>
                         {{issue}}{% if forloop.last %}{% else %},{% endif %}
                     </li>
@@ -138,7 +138,7 @@ <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
             {% endif %}
         </div>
 
-        {% if lobbying_clients %}
+        {% if section.lobbying_clients %}
         <div class="twoColumn chartWrapper">
             <table class="twoColumn">
                 <thead>
@@ -148,7 +148,7 @@ <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
                     </tr>
                 </thead>
                 <tbody>
-                    {% for row in lobbying_clients %}
+                    {% for row in section.lobbying_clients %}
                     <tr class="{% cycle 'even' 'odd' %}">
                         <td>	    
                             {% if row.registrant_entity %}
@@ -168,9 +168,9 @@ <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
     {% endif %}
 
     <div class="external">
-        {% if lobbying_links %}
+        {% if section.lobbying_links %}
         For more information on lobbying:
-        {% for link in lobbying_links %}
+        {% for link in section.lobbying_links %}
         <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
         {% endfor %}
         {% endif %}
diff --git a/templates/org_contractor_misconduct.html b/templates/org_contractor_misconduct.html
index 53708aa..3846f2a 100644
--- a/templates/org_contractor_misconduct.html
+++ b/templates/org_contractor_misconduct.html
@@ -23,14 +23,14 @@ <h3 class="insideBar">Contractor Misconduct,
 
 <div class="chartModule">
 
-    {% include "contractor_misconduct_table.html" %}
+    {% include "contractor_misconduct_table.html" with contractor_misconduct=section.contractor_misconduct %}
 
     <div class="clear"></div>
 
     <div class="external">
-        {% if pogo_links %}
+        {% if section.pogo_links %}
             For more information:
-            {% for link in pogo_links %}
+            {% for link in section.pogo_links %}
                 <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
             {% endfor %}
         {% endif %}
diff --git a/templates/org_charts.html b/templates/org_contributions.html
similarity index 96%
rename from templates/org_charts.html
rename to templates/org_contributions.html
index fb61bf9..9a0ce7d 100644
--- a/templates/org_charts.html
+++ b/templates/org_contributions.html
@@ -1,6 +1,6 @@
 <div class="twoColumn chartWrapper">
   <div class="chart">
-    {% if recipients_barchart_data %}
+    {% if section.recipients_barchart_data %}
     <h4 class="key withTip">Top Recipients</h4>
     <dl class="key">
         <dt class="employees">Employee Color Block</dt>
diff --git a/templates/org_earmarks.html b/templates/org_earmarks.html
index 550c06c..1581809 100644
--- a/templates/org_earmarks.html
+++ b/templates/org_earmarks.html
@@ -25,14 +25,14 @@ <h3 class="insideBar">Earmarks,
 
 <div class="chartModule">
 
-  {% include "earmarks_table.html" %}
+  {% include "earmarks_table.html" with earmarks=section.earmarks %}
   
   <div class="clear"></div>
   
   <div class="external">
-	{% if earmark_links %}
+	{% if section.earmark_links %}
     For more information on earmarks:
-    {% for link in earmark_links %}
+    {% for link in section.earmark_links %}
     <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
     {% endfor %}
     {% endif %}
diff --git a/templates/org_epa_echo.html b/templates/org_epa_echo.html
index aa1c240..d11b655 100644
--- a/templates/org_epa_echo.html
+++ b/templates/org_epa_echo.html
@@ -27,14 +27,14 @@ <h3 class="insideBar">EPA Violations,
 
 <div class="chartModule">
 
-    {% include "epa_echo_table.html" %}
+    {% include "epa_echo_table.html" with epa_echo=section.epa_echo %}
 
     <div class="clear"></div>
 
     <div class="external">
-        {% if epa_links %}
+        {% if section.epa_links %}
         For more information, search for this organization at EPA or see TransparencyData.com:
-            {% for link in epa_links %}
+            {% for link in section.epa_links %}
             <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
             {% endfor %}
         {% endif %}
diff --git a/templates/org_grants_and_contracts.html b/templates/org_grants_and_contracts.html
index 2bdbd5c..9c29597 100644
--- a/templates/org_grants_and_contracts.html
+++ b/templates/org_grants_and_contracts.html
@@ -11,7 +11,7 @@ <h3 class="insideBar">Federal Spending,
       {% endifequal %}</h3>
       <div class="insideBar amount">
           <span class="amount">
-	  		{{ gc_found_things|join:"; " }}
+	  		{{ section.gc_found_things|join:"; " }}
       	  </span>
           <a class="descriptor" title="More Information" href="#spendingDescriptor">Information</a>
           <div class="clear"></div>      
@@ -41,7 +41,7 @@ <h3 class="insideBar">Federal Spending,
 		<th class="right">Amount</th>
     </thead>
     <tbody>
-    {% for row in grants_and_contracts %}
+    {% for row in section.grants_and_contracts %}
       <tr class="{% cycle 'even' 'odd' %}">
         <td class="cell-type"><div class="label-{% if row.type = 'g' %}grant{% else %}{% if row.type = 'l' %}loan{% else %}contract{% endif %}{% endif %}">{% if row.type = 'g' %}grant{% else %}{% if row.type = 'l' %}loan{% else %}contract{% endif %}{% endif %}</div></td>
         <td class="cell-recipient">{{ row.recipient_name|standardize_organization_name }}</td>
@@ -57,9 +57,9 @@ <h3 class="insideBar">Federal Spending,
   <div class="clear"></div>
   
   <div class="external">
-    {% if gc_links %}
+    {% if section.gc_links %}
     For more information on grants and contracts:
-    {% for link in gc_links %}
+    {% for link in section.gc_links %}
     <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
     {% endfor %}
     {% endif %}
diff --git a/templates/org_lobbying.html b/templates/org_lobbying.html
index e8b5ac0..6f00891 100644
--- a/templates/org_lobbying.html
+++ b/templates/org_lobbying.html
@@ -14,7 +14,7 @@ <h3 class="insideBar">Lobbying,
     </h3>
     <div class="insideBar amount">
         <span class="amount">
-            {% if is_lobbying_firm %} 
+            {% if section.is_lobbying_firm %} 
         	    {% if entity_info.totals.firm_income %}
         	    	${{ entity_info.totals.firm_income|floatformat:0|intcomma }} Income
         	    {% endif %}
@@ -41,14 +41,14 @@ <h3 class="insideBar">Lobbying,
 
 
 <div class="chartModule">
-    {% if is_lobbying_firm %}
+    {% if section.is_lobbying_firm %}
 	  <h4>Lobbying Carried Out by {{ entity_info.name }}</h4>
 	  <div class="oneColumn chartWrapper">
-	      {% if lobbying_lobbyists %}
+	      {% if section.lobbying_lobbyists %}
     	  <div class="lobbyistsOrgs">
     		  <h5>Lobbyists Employed</h5>
     		  <ul>
-    			  {% for row in lobbying_lobbyists %}
+    			  {% for row in section.lobbying_lobbyists %}
     			  {% if row.lobbyist_entity %}
     			  <li>
     				  <a href="/individual/{{ row.lobbyist_name|standardize_individual_name|slugify }}/{{ row.lobbyist_entity }}{{cycle|pretty_cycle}}">{{ row.lobbyist_name|standardize_individual_name }}</a>,
@@ -62,11 +62,11 @@ <h5>Lobbyists Employed</h5>
     	  </div>
     	  {% endif %}
   
-    	  {% if lobbying_issues %}
+    	  {% if section.lobbying_issues %}
     	  <div class="issuesLobbied">
     		  <h5>Most Frequently Disclosed Lobbying Issues</h5>
     		  <ul>
-    			  {% for issue in lobbying_issues %}
+    			  {% for issue in section.lobbying_issues %}
     			  <li>
     				  {{issue}}{% if forloop.last %}{% else %},{% endif %}
     			  </li>
@@ -77,7 +77,7 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
     	  {% endif %}
     </div>
   
-	  {% if lobbying_clients %}
+	  {% if section.lobbying_clients %}
 	  <div class="twoColumn chartWrapper">
 		  <table class="twoColumn">
 			  <thead>
@@ -87,7 +87,7 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
 				  </tr>
 			  </thead>
 			  <tbody>
-				  {% for row in lobbying_clients %}
+				  {% for row in section.lobbying_clients %}
 				  <tr class="{% cycle 'even' 'odd' %}">
 					  <td>	    
 						  {% if row.client_entity %}
@@ -109,10 +109,10 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
 	  <h4>Lobbying On Behalf of {{ entity_info.name }}</h4>
 	  <div class="lobbyingColumn oneColumn chartWrapper">
 		  <div class="lobbyistsOrgs">
-			  {% if lobbying_lobbyists %}
+			  {% if section.lobbying_lobbyists %}
 			  <h5>Names of Lobbyists</h5>
 			  <ul>
-				  {% for row in lobbying_lobbyists %}
+				  {% for row in section.lobbying_lobbyists %}
 				  {% if row.lobbyist_entity %}
 				  <li>
 					  <a href="/individual/{{ row.lobbyist_name|standardize_individual_name|slugify }}/{{ row.lobbyist_entity }}{{cycle|pretty_cycle}}">{{ row.lobbyist_name|standardize_individual_name }}</a>,
@@ -126,11 +126,11 @@ <h5>Names of Lobbyists</h5>
 			  {% endif %}
 		  </div>
   
-		  {% if lobbying_issues %}
+		  {% if section.lobbying_issues %}
 		  <div class="issuesLobbied">
 			  <h5>Most Frequently Disclosed Lobbying Issues</h5>
 			  <ul>
-				  {% for issue in lobbying_issues %}
+				  {% for issue in section.lobbying_issues %}
 				  <li>
 					  {{issue}}{% if forloop.last %}{% else %},{% endif %}
 				  </li>
@@ -140,7 +140,7 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
 		  {% endif %}
 	  </div>
   
-	  {% if lobbying_clients %}
+	  {% if section.lobbying_clients %}
 	  <div class="twoColumn chartWrapper">
 		  <table class="twoColumn">
 			  <thead>
@@ -150,7 +150,7 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
 				  </tr>
 			  </thead>
 			  <tbody>
-				  {% for row in lobbying_clients %}
+				  {% for row in section.lobbying_clients %}
 				  <tr class="{% cycle 'even' 'odd' %}">
 					  <td>	    
 						  {% if row.registrant_entity %}
@@ -170,7 +170,7 @@ <h5>Most Frequently Disclosed Lobbying Issues</h5>
   
 	<div class="clear"></div> 
 	
-  {% if lobbying_bills %}
+  {% if section.lobbying_bills %}
 	<div class="oneColumn chartWrapper">
 		<h5>Most Frequently Disclosed Bills</h5>
 		<table>
@@ -181,7 +181,7 @@ <h5>Most Frequently Disclosed Bills</h5>
 				</tr>
 			</thead>
 			<tbody>
-				{% for bill in lobbying_bills %}
+				{% for bill in section.lobbying_bills %}
 					<tr class="{% cycle 'even' 'odd' %}">
 						{% if bill.link %}
 							<td><a href="{{bill.link}}" target="_blank">{{bill.bill}}</a></td>
@@ -196,23 +196,23 @@ <h5>Most Frequently Disclosed Bills</h5>
 	</div>
   {% endif %}
   
-  {% if lobbyist_registration_tracker %}
+  {% if section.lobbyist_registration_tracker %}
 	<div class="twoColumn chartWrapper">
 		<h5>Recent Lobbying Contracts</h5>
 		<table>
 			<thead class="titles">
 				<tr>
 					<th>Date</th>
-					<th>{% if is_lobbying_firm %}Client{% else %}Registrant{% endif %}</th>
+					<th>{% if section.is_lobbying_firm %}Client{% else %}Registrant{% endif %}</th>
 					<th>Summary</th>
 				</tr>
 			</thead>
 			<tbody>
-				{% for record in lobbyist_registration_tracker %}
+				{% for record in section.lobbyist_registration_tracker %}
 					<tr class="{% cycle 'even' 'odd' %}">
 						<td>{{ record.date|date }}</sup></td>
 						<td>
-							{% if is_lobbying_firm %}
+							{% if section.is_lobbying_firm %}
 							{% if record.client.ie_path %}
 							<a href="{{ record.client.ie_path }}">{{ record.client.name }}</a>
 							{% else %}
@@ -239,9 +239,9 @@ <h5>Recent Lobbying Contracts</h5>
 
   
   <div class="external">
-	  {% if lobbying_links %}
+	  {% if section.lobbying_links %}
 		  For more information on lobbying:
-	  {% for link in lobbying_links %}
+	  {% for link in section.lobbying_links %}
 	  <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
 	  {% endfor %}
 	  {% endif %}
diff --git a/templates/organization.html b/templates/organization.html
index 1ea970a..d20e33f 100644
--- a/templates/organization.html
+++ b/templates/organization.html
@@ -7,15 +7,6 @@
     {{ entity_info.name|standardize_organization_name}} | 
 {% endblock %}
 
-{% block pagetopics %}: {% spaceless %}
-    {% filter nonempty_lines|pretty_list %}
-        {% if contributions_data %}Campaign Contributions{% endif %}
-		{% if lobbying_data %}Lobbying{% endif %}
-        {% if earmarks %}Earmarks{% endif %}
-		{% if grants_and_contracts %}Grants &amp; Contracts{% endif %}
-    {% endfilter %}
-{% endspaceless %}{% endblock %}
-
 {% block canonicalurl %}/organization/{{ entity_info.name|standardize_organization_name|slugify }}/{{ entity_info.id }}{{cycle|pretty_cycle}}{% endblock %}
 
 {% block metadesc %}{{ entity_info.name|standardize_organization_name }} has given ${{entity_info.totals.contributor_amount|floatformat:0|intcomma }} in campaign contributions from {% ifequal cycle "-1" %}{{entity_info.camp_fin_years.start|add:-1}} to {{entity_info.camp_fin_years.end}}{% else %}{{cycle|add:-1}} to {{cycle}}{% endifequal %}. See where the money went on Influence Explorer.{% endblock %}
@@ -34,11 +25,11 @@
 <script type="text/javascript" src="/media/js/jquery.shorteners.js"></script>
 <script type="text/javascript" charset="utf-8">
 $(document).ready(function() {
-  {% if sparkline_data %}sparkline_by_party("sparklines", {{ sparkline_data|safe }}, {{ cut_off_sparkline_at_step }});{% endif %}
-  {% if not suppress_contrib_graphs %}
-  piechart("piechart_level", {% if level_breakdown %}{{ level_breakdown|safe }}{% else %}{}{% endif %});
-  piechart("piechart_party", {% if party_breakdown %}{{ party_breakdown|safe }}{% else %}{}{% endif %}, type="party" );
-  barchart("recipients_barchart", {% if recipients_barchart_data %}{{ recipients_barchart_data|safe }} {% else %} [] {% endif %});
+  {% if sections.contributions.sparkline_data %}sparkline_by_party("sparklines", {{ sections.contributions.sparkline_data|safe }}, {{ sections.contributions.cut_off_sparkline_at_step }});{% endif %}
+  {% if not sections.contributions.suppress_contrib_graphs %}
+  piechart("piechart_level", {% if sections.contributions.level_breakdown %}{{ sections.contributions.level_breakdown|safe }}{% else %}{}{% endif %});
+  piechart("piechart_party", {% if sections.contributions.party_breakdown %}{{ sections.contributions.party_breakdown|safe }}{% else %}{}{% endif %}, type="party" );
+  barchart("recipients_barchart", {% if sections.contributions.recipients_barchart_data %}{{ sections.contributions.recipients_barchart_data|safe }} {% else %} [] {% endif %});
   {% endif %}
   
   $('table#grantsContracts td').multiellipsis(3);
@@ -85,46 +76,3 @@ <h2>{{ entity_info.name|standardize_organization_name }}</h2>
 {% endif %}
 {% endblock %}
 {% endif %}
-
-
-{% block contributions %}
-{% if contributions_data %}
-    {{ block.super }}
-    {% include "contributions.html" %}
-{% endif %}
-{% endblock %}
-
-{% block lobbying %}
-{% if lobbying_data %}
-    {{ block.super }}
-    {% include "org_lobbying.html" %}
-{% endif %}
-{% endblock %}
-
-{% block earmarks %}
-{% if earmarks %}
-    {{ block.super }}
-    {% include "org_earmarks.html" %}
-{% endif %}
-{% endblock %}
-
-{% block grants_and_contracts %}
-{% if grants_and_contracts %}
-    {{ block.super }}
-    {% include "org_grants_and_contracts.html" %}
-{% endif %}
-{% endblock %}
-
-{% block contractor_misconduct %}
-{% if contractor_misconduct %}
-    {{ block.super }}
-    {% include "org_contractor_misconduct.html" %}
-{% endif %}
-{% endblock %}
-
-{% block epa_echo %}
-{% if epa_echo %}
-    {{ block.super }}
-    {% include "org_epa_echo.html" %}
-{% endif %}
-{% endblock %}
diff --git a/templates/pol_charts.html b/templates/pol_contributions.html
similarity index 86%
rename from templates/pol_charts.html
rename to templates/pol_contributions.html
index a2e6c21..dee75d7 100644
--- a/templates/pol_charts.html
+++ b/templates/pol_contributions.html
@@ -1,12 +1,12 @@
 <div class="twoColumn chartWrapper">
   <div class="chart">
-    {% if industries_barchart_data %}
+    {% if section.industries_barchart_data %}
     <h4 class="withTip">Top Industries</h4>
     <span class="tip">OpenSecrets.org and FollowTheMoney.org classify contribution data into about 100 <a href="http://www.opensecrets.org/lobby/list_indus.php">industries</a>.</span>
     <div class="graph" id="industries_barchart">
       <!-- raphael charts -->
     </div>
-    <span class="tip">{{ pct_known }}% of the total amount raised came from an identifiable industry.</span>
+    <span class="tip">{{ section.pct_known }}% of the total amount raised came from an identifiable industry.</span>
     {% endif %}
   </div>
 </div>
@@ -34,7 +34,7 @@ <h4 class="withTip">Individuals vs. PACs</h4>
 <div class="twoColumn chartWrapper">
   <div class="chart">
 
-    {% if contributors_barchart_data %}
+    {% if section.contributors_barchart_data %}
     <h4 class="withTip key">Top Contributors</h4>
     <dl class="key">
         <dt class="employees">Employee Color Block</dt>
@@ -52,11 +52,11 @@ <h4 class="withTip key">Top Contributors</h4>
   </div>
 </div>
 
-{% if partytime_data %}
-  {% if partytime_data.past or partytime_data.upcoming %}
+{% if section.partytime_data %}
+  {% if section.partytime_data.past or section.partytime_data.upcoming %}
   <div class="twoColumn chartWrapper">
     <h4 class="withTip">Recent and upcoming fundraisers</h4>
-    <span class="tip">Full invitations can be viewed at <a href="{{ partytime_link }}">Party Time</a></span>
+    <span class="tip">Full invitations can be viewed at <a href="{{ section.partytime_link }}">Party Time</a></span>
     <table class="twoColumn">
       <thead>
         <tr id="partyTime">
@@ -65,7 +65,7 @@ <h4 class="withTip">Recent and upcoming fundraisers</h4>
         </tr>
       </thead>
       <tbody>
-        {% for type, events in partytime_data.items %}
+        {% for type, events in section.partytime_data.items %}
           {% for row in events %}
             <tr class="{% cycle 'even' 'odd' %} {{ type }}">
               <td>{{ row.date|date }}</td>
diff --git a/templates/pol_earmarks.html b/templates/pol_earmarks.html
index 4d32004..d91ab67 100644
--- a/templates/pol_earmarks.html
+++ b/templates/pol_earmarks.html
@@ -35,14 +35,14 @@ <h4 class="withTip">In State vs. Out of State</h4>
 	  </div>
 	</div>
 
-  {% include "earmarks_table.html" %}
+  {% include "earmarks_table.html" with earmarks=section.earmarks %}
   
   <div class="clear"></div>
   
   <div class="external">
-	{% if earmark_links %}
+	{% if section.earmark_links %}
     For more information on earmarks:
-    {% for link in earmark_links %}
+    {% for link in section.earmark_links %}
     <a href="{{ link.url }}" class="external" target="_blank">{{ link.text }}</a>
     {% endfor %}
     {% endif %}
diff --git a/templates/politician.html b/templates/politician.html
index 64bde0d..7b5fadb 100644
--- a/templates/politician.html
+++ b/templates/politician.html
@@ -10,13 +10,6 @@
     |
 {% endspaceless %} {% endblock %}
 
-{% block pagetopics %}: {% spaceless %}
-    {% filter nonempty_lines|pretty_list %}
-        {% if contributions_data %}Campaign Contributions{% endif %}
-        {% if earmarks %}Earmarks{% endif %}
-    {% endfilter %}
-{% endspaceless %}{% endblock %}
-
 {% block canonicalurl %}/politician/{{ entity_info.name|standardize_politician_name|slugify }}/{{ entity_info.id }}{{cycle|pretty_cycle}}{% endblock %}
 
 {% block metadesc %}{% if entity_info.metadata.seat %}{{ entity_info.name|standardize_politician_name|seat_title:entity_info.metadata.seat }}{% else %}{{ entity_info.name|standardize_politician_name }}{% endif %} {% if entity_info.metadata.party %}({{entity_info.metadata.party}}{% if entity_info.metadata.state %}-{{entity_info.metadata.state}}{% endif %}){% endif %} has received ${{entity_info.totals.recipient_amount|floatformat:0|intcomma }} in campaign contributions from {% ifequal cycle "-1" %}{{entity_info.camp_fin_years.start|add:-1}} to {{entity_info.camp_fin_years.end}}{% else %}{{cycle|add:-1}} to {{cycle}}{% endifequal %}. See where the money came from on Influence Explorer.{% endblock %}
@@ -48,16 +41,16 @@
 <script type="text/javascript" src="/media/js/jquery.shorteners.js"></script>
 <script type="text/javascript" charset="utf-8">
 $(document).ready(function() {
-    sparkline("sparklines", {% if sparkline_data %}{{ sparkline_data|safe }}{% else %}[]{% endif %});
+    sparkline("sparklines", {% if sections.contributions.sparkline_data %}{{ sections.contributions.sparkline_data|safe }}{% else %}[]{% endif %});
 
-    {% if not suppress_contrib_graphs %}
-    piechart("piechart_local", {% if local_breakdown %} {{ local_breakdown|safe }} {% else %} {} {% endif %} );
-    piechart("piechart_entity", {% if entity_breakdown %} {{ entity_breakdown|safe }} {% else %} {} {% endif %} );
-    barchart("industries_barchart", {% if industries_barchart_data %}{{ industries_barchart_data|safe }} {% else %}[]{% endif %});
-    barchart("contributors_barchart", {% if contributors_barchart_data %}{{ contributors_barchart_data|safe }} {% else %}[]{% endif %});
+    {% if not sections.contributions.suppress_contrib_graphs %}
+    piechart("piechart_local", {% if sections.contributions.local_breakdown %} {{ sections.contributions.local_breakdown|safe }} {% else %} {} {% endif %} );
+    piechart("piechart_entity", {% if sections.contributions.entity_breakdown %} {{ sections.contributions.entity_breakdown|safe }} {% else %} {} {% endif %} );
+    barchart("industries_barchart", {% if sections.contributions.industries_barchart_data %}{{ sections.contributions.industries_barchart_data|safe }} {% else %}[]{% endif %});
+    barchart("contributors_barchart", {% if sections.contributions.contributors_barchart_data %}{{ sections.contributions.contributors_barchart_data|safe }} {% else %}[]{% endif %});
     {% endif %}
 
-    piechart("earmarks_local", {% if earmarks_local %} {{ earmarks_local|safe }} {% else %} {} {% endif %} );
+    piechart("earmarks_local", {% if sections.earmarks.earmarks_local %} {{ sections.earmarks.earmarks_local|safe }} {% else %} {} {% endif %} );
 
     $('td.cell-earmark-description .earmark_mainDescription').multiellipsis(3);
     $('table td.cell-earmark-description').expando(5, '.earmark-requests', 'span.requestedList', 'moreEarmarks');
@@ -112,23 +105,3 @@ <h2>{{ entity_info.name|standardize_politician_name }}</h2>
 {% endif %}
 {% endif %}
 {% endblock %}
-
-{% block contributions %}
-{% if contributions_data %}
-{{ block.super }}
-{% include "contributions.html" %}
-{% endif %}
-{% endblock %}
-
-
-{% block charts %}
-{% endblock %} <!-- end charts block -->
-
-
-{% block earmarks %}
-{% if earmarks %}
-    {{ block.super }}
-    {% include "pol_earmarks.html" %}
-{% endif %}
-{% endblock %}
-