diff --git a/ckanext/harvest/templates_new/snippets/source_item.html b/ckanext/harvest/templates_new/snippets/source_item.html
index 4ae3c4c..200d90f 100644
--- a/ckanext/harvest/templates_new/snippets/source_item.html
+++ b/ckanext/harvest/templates_new/snippets/source_item.html
@@ -18,7 +18,7 @@ Example:
 {% set truncate_title = truncate_title or 80 %}
 {% set title = source.title or source.name %}
 {% set source_type = h.get_pkg_dict_extra(source, 'source_type') %}
-{% set url = h.url_for('harvest_edit', id=source.name) if within_organization else h.url_for('harvest_read', id=source.name) %}
+{% set url = h.url_for('harvest_admin', id=source.name) if within_organization else h.url_for('harvest_read', id=source.name) %}
 
 <li class="{{ item_class or "dataset-item" }}">
   <div class="dataset-content">
diff --git a/ckanext/harvest/templates_new/source/base.html b/ckanext/harvest/templates_new/source/base.html
index 8be4e80..0d4712c 100644
--- a/ckanext/harvest/templates_new/source/base.html
+++ b/ckanext/harvest/templates_new/source/base.html
@@ -11,14 +11,11 @@
 
 {% block breadcrumb_content_root_selected %} class="active"{% endblock %}
 
-{#
-  TODO: once #354 is merged in CKAN core we can re-adjust the truncation
-  lengths here (as the breadcrumbs are a little different in #354)
-#}
 {% block breadcrumb_content %}
   {% if source.organization %}
+    {% set org = source.organization %}
     <li>{{ h.nav_named_link(_('Organizations'), 'organizations_index') }}</li>
-    <li>{{ h.nav_named_link(source.organization.title or source.organization.name|truncate(10), 'organization_read', id=source.organization.name) }}</li>
+    <li>{{ h.nav_named_link(org.title or org.name|truncate(10), 'organization_read', id=org.name) }}</li>
     <li>{{ h.nav_named_link(_('Harvest Sources'), '{0}_search'.format(c.dataset_type)) }}</li>
     <li{{ self.breadcrumb_content_root_selected() }}>{{ h.nav_named_link(c.harvest_source.title|truncate(10), '{0}_read'.format(c.dataset_type), id=c.harvest_source.name) }}</li>
   {% else %}
diff --git a/ckanext/harvest/templates_new/source/org_source_list.html b/ckanext/harvest/templates_new/source/org_source_list.html
index f0632b8..588bb44 100644
--- a/ckanext/harvest/templates_new/source/org_source_list.html
+++ b/ckanext/harvest/templates_new/source/org_source_list.html
@@ -6,6 +6,12 @@
   <div class="clearfix">
     <h1 class="hide-heading">{{ _('Harvest Sources') }}</h1>
     <div class="primary">
+      <div class="m-bottom">
+        <a href="{{ h.url_for('harvest_new', group=c.group_dict.id) }}" class="btn btn-primary">
+          <i class="icon-plus-sign-alt"></i>
+          {{ _('Add Harvest Source') }}
+        </a>
+      </div>
       <h3 class="results">
         {%- if c.page.item_count -%}
           {{ c.page.item_count }} harvest sources{{ _(" found for \"{query}\"").format(query=c.q) if c.q }}
@@ -15,7 +21,11 @@
           {{ _('Harvest Sources') }}
         {%- endif -%}
       </h3>
-      {% snippet 'snippets/source_list.html', sources=c.page.items, within_organization=true %}
+      {% if c.page.item_count %}
+        {% snippet 'snippets/source_list.html', sources=c.page.items, within_organization=true %}
+      {% else %}
+        <p class="empty">{{ _('Sorry no harvest sources found') }}</p>
+      {% endif %}
     </div>
     <aside class="tertiary">
       <form method="GET">
@@ -30,4 +40,3 @@
   </div>
   {{ c.page.pager() }}
 {% endblock %}
-