--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -3,137 +3,175 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
 
-  <py:def function="page_title">Site analytics</py:def>
+  <xi:include href="../ga_util.html" />
+
+  <py:def function="page_title">Site usage</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/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>
+    <script type="text/javascript" src="/scripts/vendor/d3.v2.js"></script>
+    <script type="text/javascript" src="/scripts/vendor/d3.layout.min.js"></script>
+    <script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>
+  </py:def>
+
+  <py:match path="primarysidebar">
+    ${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 statistics</h1>
 
-      <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
-          <div class="controls">
-          <select name="month">
-              <py:for each="val,desc in c.months">
-                <option value='${val}' py:attrs="{'selected': 'selected' if c.month == val else None}">${desc}</option>
-              </py:for>
-          </select>
-           <input class="btn button" type='submit' value="Update"/>
-          </div>
-       </form>
-
-    <p><a href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month)}">Export data</a> as CSV</p>
-
+    <div class="boxed">
     <div class="tabbable">
       <ul class="nav nav-tabs">
-        <li class="active"><a href="#totals" data-toggle="tab">Totals</a></li>
-        <li><a href="#browsers" data-toggle="tab">Browsers</a></li>
-        <li><a href="#os" data-toggle="tab">Operating Systems</a></li>
-        <li><a href="#social_networks" data-toggle="tab">Social Networks</a></li>
-        <li><a href="#languages" data-toggle="tab">Languages</a></li>
-        <li><a href="#country" data-toggle="tab">Country</a></li>
+        <li class="active"><a href="#totals" data-toggle="hashtab">Totals</a></li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Browsers
+                <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="#browsers_names" data-toggle="hashtab">Browsers</a></li>
+                <li><a href="#browsers_versions" data-toggle="hashtab">Versions</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Operating Systems
+                <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="#os" data-toggle="hashtab">Operating Systems</a></li>
+                <li><a href="#os_versions" data-toggle="hashtab">Versions</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Social
+                <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="#social_networks" data-toggle="hashtab">All networks</a></li>
+                <li><a href="#social_referrals_totals" data-toggle="hashtab">Referral links</a></li>
+            </ul>
+        </li>
+        <li><a href="#languages" data-toggle="hashtab">Languages</a></li>
+        <li><a href="#country" data-toggle="hashtab">Country</a></li>
       </ul>
       <div class="tab-content">
         <div class="tab-pane active" id="totals">
-             <table class="table table-condensed table-bordered table-striped">
+             <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='index')}" method="get">
+               <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">
             	 <tr>
             	   <th>Name</th>
-            	   <th>Value</th>
+            	   <th class="td-numeric">Value</th>
+            	   <th>History</th>
             	 </tr>
-                <py:for each="name, value in c.global_totals">
+                <py:for each="name, value, graph in c.global_totals">
                     <tr>
                         <td>${name}</td>
-                        <td>${value}</td>
+                        <td class="td-numeric">${value}</td>
+                        <td class="sparkline-cell">
+                          <span class="sparkline" sparkTooltips="${','.join([x for x,y in graph])}">
+                            ${','.join([y for x,y in graph])}
+                          </span>
+                        </td>
                     </tr>
                 </py:for>
                </table>
         </div>
-        <div class="tab-pane" id="browsers">
-             <table class="table table-condensed table-bordered table-striped">
-            	 <tr>
-            	   <th>Name</th>
-            	   <th>Value</th>
-            	 </tr>
-                <py:for each="name, value in c.browsers">
-                    <tr>
-                        <td>${name}</td>
-                        <td>${value}</td>
-                    </tr>
-                </py:for>
-               </table>
-        </div>
-        <div class="tab-pane" id="os">
-             <table class="table table-condensed table-bordered table-striped">
-            	 <tr>
-            	   <th>Name</th>
-            	   <th>Value</th>
-            	 </tr>
-                <py:for each="name, value in c.os">
-                    <tr>
-                        <td>${name}</td>
-                        <td>${value}</td>
-                    </tr>
-                </py:for>
-               </table>
+         <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">
+               <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">
+               <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">
+               <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">
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
+               ${month_selector(c.month, c.months, c.day)}
+             </form>
+             ${stat_table(c.os_versions)}
+         </div>
+        <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">
+               <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">
-             <table class="table table-condensed table-bordered table-striped">
-            	 <tr>
-            	   <th>Name</th>
-            	   <th>Value</th>
-            	 </tr>
-                <py:for each="name, value in c.social_networks">
-                    <tr>
-                        <td>${name}</td>
-                        <td>${value}</td>
-                    </tr>
-                </py:for>
-               </table>
+             ${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">
+               <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">
-             <table class="table table-condensed table-bordered table-striped">
-            	 <tr>
-            	   <th>Name</th>
-            	   <th>Value</th>
-            	 </tr>
-                <py:for each="name, value in c.languages">
-                    <tr>
-                        <td>${name}</td>
-                        <td>${value}</td>
-                    </tr>
-                </py:for>
-               </table>
+             ${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">
+               <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">
-             <table class="table table-condensed table-bordered table-striped">
-            	 <tr>
-            	   <th>Name</th>
-            	   <th>Value</th>
-            	 </tr>
-                <py:for each="name, value in c.country">
-                    <tr>
-                        <td>${name}</td>
-                        <td>${value}</td>
-                    </tr>
-                </py:for>
-               </table>
+             ${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">
+               <h4 class="ga-reports-heading">Show stats table for:</h4>
+               ${month_selector(c.month, c.months, c.day)}
+             </form>
+             ${stat_table(c.country)}
         </div>
+       </div>
+     </div>
+   </div>
+  </div>
 
 
-       </div>
-     </div>
-
-
-
-  </div>
+  <py:def function="optional_footer">
+    <script type="text/javascript">
+      $(function() {
+        CKAN.GA_Reports.bind_sparklines();
+        CKAN.GA_Reports.bind_sidebar();
+        CKAN.GA_Reports.bind_month_selector();
+      });  
+    </script>
+  </py:def>
 
   <xi:include href="../../layout.html" />
-
-  <py:def function="optional_footer">
-    <script type='text/javascript'>
-        $('.nav-tabs li a').click(function (e) {
-          e.preventDefault();
-          $(this).tab('show');
-        })
-    </script>
-  </py:def>
 </html>