--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -7,11 +7,10 @@
 
   <py:def function="page_title">Site usage</py:def>
 
-  <py:def function="content_class"><!----></py:def>
-
   <py:def function="optional_head">
     <link rel="stylesheet" type="text/css" href="/scripts/vendor/rickshaw.min.css"/>
     <link rel="stylesheet" type="text/css" href="/css/ga_report.css?1"/>
+    <script type="text/javascript" src="/scripts/modernizr-2.6.2.custom.js"></script>
     <script type="text/javascript" src="/scripts/ckanext_ga_reports.js?1"></script>
     <script type="text/javascript" src="/scripts/vendor/jquery.sparkline.modified.js"></script>
     <script type="text/javascript" src="/scripts/rickshaw_ie7_shim.js"></script>
@@ -24,8 +23,9 @@
     ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all'))}
   </py:match>
 
+  <py:def function="page_heading">Site Usage ${usage_nav('Site-wide')}</py:def>
+
   <div py:match="content">
-      <h1>Site Usage ${usage_nav('Site-wide')}</h1>
 
     <div class="boxed">
     <div class="tabbable">
@@ -61,7 +61,7 @@
       <div class="tab-content">
         <div class="tab-pane active" id="totals">
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              <table class="ga-reports-table table table-condensed table-bordered table-striped">
@@ -85,33 +85,37 @@
         </div>
          <div class="tab-pane" id="browsers_versions">
              ${rickshaw_graph(c.browser_versions_graph,'browser-versions',mode='stack')}
+             <hr/>
              <p>Note: Where a browser has a large number of versions, these have been grouped together.</p>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.browser_versions)}
          </div>
          <div class="tab-pane" id="browsers_names">
              ${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')}
+             <hr/>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.browsers)}
          </div>
          <div class="tab-pane" id="os">
              ${rickshaw_graph(c.os_graph,'os',mode='stack')}
+             <hr/>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.os)}
          </div>
          <div class="tab-pane" id="os_versions">
              ${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')}
+             <hr/>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.os_versions)}
@@ -119,32 +123,35 @@
         <div class="tab-pane" id="social_referrals_totals">
             <p>Number of visits that were referred from social networks</p>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
             ${social_table(c.social_referrer_totals)}
         </div>
         <div class="tab-pane" id="social_networks">
              ${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')}
+             <hr/>
             <p>Percentage of visits that were referred from these social networks</p>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.social_networks, 'Visits')}
         </div>
         <div class="tab-pane" id="languages">
              ${rickshaw_graph(c.languages_graph,'languages',mode='stack')}
+             <hr/>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.languages)}
         </div>
         <div class="tab-pane" id="country">
              ${rickshaw_graph(c.country_graph,'country',mode='stack')}
+             <hr/>
              <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-               <label>Show stats table for:</label>
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
                ${month_selector(c.month, c.months, c.day)}
              </form>
              ${stat_table(c.country)}
@@ -161,7 +168,7 @@
         CKAN.GA_Reports.bind_sparklines();
         CKAN.GA_Reports.bind_sidebar();
         CKAN.GA_Reports.bind_month_selector();
-      });  
+      });
     </script>
   </py:def>