diff --git a/ckanext/zarr/plugin.py b/ckanext/zarr/plugin.py
index 9f1439e..02b1642 100644
--- a/ckanext/zarr/plugin.py
+++ b/ckanext/zarr/plugin.py
@@ -45,8 +45,9 @@ def update_config(self, config_):
     # IFacets
     def dataset_facets(self, facet_dict, package_type):
         new_fd = OrderedDict()
-        new_fd['program_area'] = plugins.toolkit._('Program Areas')
+        new_fd['organization'] = plugins.toolkit._('Organizations')
         new_fd['tags'] = plugins.toolkit._('Tags')
+        new_fd['groups'] = plugins.toolkit._('Topics')
         return new_fd
 
     # IResourceController
diff --git a/ckanext/zarr/templates/header.html b/ckanext/zarr/templates/header.html
index 6e7dd9f..2b3c648 100644
--- a/ckanext/zarr/templates/header.html
+++ b/ckanext/zarr/templates/header.html
@@ -7,18 +7,21 @@
         header_title='Zambia Research and<br/>Evaluation Repository' | safe %}
 {% endblock %}
 
-{% block nav_items %}
-        {% if c.userobj %}
+{%  block nav_items_signed %}
             {{ h.build_nav_main(
+                ('organization.index', _('Organizations')),
+                ('dataset.search', _('Data')),
                 ('home.about', _('About')),
-                ('dataset.search', _('Find Data')),
-                ('activity.dashboard', _('My account'))
                  ) }}
-        {% else %}
-            {{ h.build_nav_main(
-                ('home.about', _('About')),
-                ('dataset.search', _('Find Data')),
-                ('user.login', _('Log in'))
-                 ) }}
-        {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+
+{%  block nav_items_unsigned %}
+    {{ h.build_nav_main(
+        ('organization.index', _('Organizations')),
+        ('dataset.search', _('Data')),
+        ('home.about', _('About')),
+        ('user.login', _('Log in'))
+         ) }}
+{% endblock %}
+