--- a/ckanext/ga_report/templates/ga_report/publisher/index.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/index.html
@@ -3,39 +3,62 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
 
-  <py:def function="page_title">Analytics for ${g.site_title}</py:def>
+  <xi:include href="../ga_util.html" />
+
+  <py:def function="page_title">Usage by Publisher</py:def>
+
+  <py:match path="primarysidebar">
+    <li class="widget-container boxed widget_text">
+      <h4>Download</h4>
+      <p><center>
+          <a class="btn button btn-primary" href="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all')}">Download as CSV</a></center>
+      </p>
+    </li>
+    <li class="widget-container boxed widget_text">
+      <h4>Graph Legend</h4>
+      <div id="graph-legend-container">
+      </div>
+    </li>
+    <xi:include href="../notes.html" />
+  </py:match>
+
+  <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"/>
+    <script type="text/javascript" src="/scripts/ckanext_ga_reports.js"></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>
 
   <div py:match="content">
-      <h1>Analytics for ${c.publisher.title}</h1>
 
-      <h2>Most viewed datasets</h2>
-      <p><em>Note: this data does not include API calls</em></p>
+      <h1>Site Usage</h1>
 
-      <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='index',id=c.publisher.name)}" method="get">
+      ${usage_nav('Publishers')}
+
+
+       ${rickshaw_graph(c.top_publishers_graph,'publishers')}
+      <form class="form-inline" action="${h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publishers')}" 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"/>
+            <label>Show stats table for:</label>
+            ${month_selector(c.month, c.months, c.day)}
           </div>
        </form>
 
-       <p><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='read', id=c.publisher.name)}">${c.publisher.title} dataset list</a> was viewed ${c.publisher_page_views} times in ${c.month_desc}</p>
-
-       <table class="table table-condensed table-bordered table-striped">
+       <table class="ga-reports-table table table-condensed table-bordered table-striped">
 	 <tr>
-	   <th>Dataset</th>
-	   <th>Views</th>
-	   <th>Visits</th>
+	   <th>Publisher</th>
+	   <th class="td-numeric">Dataset Views</th>
 	 </tr>
-        <py:for each="package, views, visits in c.top_packages">
+        <py:for each="publisher, views, visits in c.top_publishers">
 	  <tr>
-	    <td>${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}
+	    <td>
+	        ${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))}
 	    </td>
-	    <td>${views}</td>
-	    <td>${visits}</td>
+	    <td class="td-numeric">${views}</td>
 	  </tr>
         </py:for>
        </table>
@@ -43,9 +66,15 @@
 
   </div>
 
+  <py:def function="optional_footer">
+    <script type="text/javascript">
+      $(function() {
+        CKAN.GA_Reports.bind_month_selector();
+      });
+    </script>
+  </py:def>
   <xi:include href="../../layout.html" />
+
 </html>
 
 
-
-