diff --git a/ckan/config/environment.py b/ckan/config/environment.py
index c6e13b62af7..1b0151e11b1 100644
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -173,6 +173,7 @@ def find_controller(self, controller):
     search.check_solr_schema_version()
 
     config['routes.map'] = routing.make_map()
+    config['routes.named_routes'] = routing.named_routes
     config['pylons.app_globals'] = app_globals.app_globals
     # initialise the globals
     config['pylons.app_globals']._init()
diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index 7187f4f4560..d3444701c1f 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -5,13 +5,65 @@
 refer to the routes manual at http://routes.groovie.org/docs/
 
 """
+import re
+
 from pylons import config
-from routes import Mapper
+from routes import Mapper as _Mapper
+
 from ckan.plugins import PluginImplementations, IRoutes
 
+named_routes = {}
 
 routing_plugins = PluginImplementations(IRoutes)
 
+
+class Mapper(_Mapper):
+    ''' This Mapper allows us to intercept the connect calls used by routes
+    so that we can collect named routes and later use them to create links
+    via some helper functions like build_nav(). '''
+
+    def connect(self, *args, **kw):
+        '''Connect a new route, storing any named routes for later.
+
+        This custom connect() method wraps the standard connect() method,
+        and additionally saves any named routes that are connected in a dict
+        ckan.routing.named_routes, which ends up being accessible via the
+        Pylons config as config['routes.named_routes'].
+
+        Also takes some additional params:
+
+        :param ckan_icon: name of the icon to be associated with this route,
+            e.g. 'group', 'time'
+        :type ckan_icon: string
+        :param highlight_actions: space-separated list of controller actions
+            that should be treated as the same as this named route for menu
+            highlighting purposes, e.g. 'index search'
+        :type highlight_actions: string
+
+        '''
+        ckan_icon = kw.pop('ckan_icon', None)
+        highlight_actions = kw.pop('highlight_actions', kw.get('action', ''))
+        out = _Mapper.connect(self, *args, **kw)
+        if len(args) == 1 or args[0].startswith('_redirect_'):
+            return out
+        # we have a named route
+        needed = []
+        matches = re.findall('\{([^:}]*)(\}|:)', args[1])
+        for match in matches:
+            needed.append(match[0])
+        route_data = {
+            'icon': ckan_icon,
+            # needed lists the names of the parameters that need defining
+            # for the route to be generated
+            'needed': needed,
+            'controller': kw.get('controller'),
+            'action': kw.get('action', ''),
+            'highlight_actions': highlight_actions
+        }
+        named_routes[args[0]] = route_data
+        return out
+
+
 def make_map():
     """Create, configure and return the routes Mapper"""
     # import controllers here rather than at root level because
@@ -158,16 +210,18 @@ def make_map():
                   action='edit')
         m.connect('related_delete', '/dataset/{id}/related/delete/{related_id}',
                   action='delete')
-        m.connect('related_list', '/dataset/{id}/related', action='list')
+        m.connect('related_list', '/dataset/{id}/related', action='list',
+                  ckan_icon='picture')
         m.connect('related_read', '/apps/{id}', action='read')
         m.connect('related_dashboard', '/apps', action='dashboard')
 
     with SubMapper(map, controller='package') as m:
-        m.connect('/dataset', action='search')
+        m.connect('search', '/dataset', action='search',
+                  highlight_actions='index search')
+        m.connect('add dataset', '/dataset/new', action='new')
         m.connect('/dataset/{action}',
           requirements=dict(action='|'.join([
               'list',
-              'new',
               'autocomplete',
               'search'
               ]))
@@ -188,8 +242,6 @@ def make_map():
           'history',
           'read_ajax',
           'history_ajax',
-          'activity',
-          'followers',
           'follow',
           'activity',
           'unfollow',
@@ -197,9 +249,14 @@ def make_map():
           'api_data',
           ]))
           )
+        m.connect('dataset_followers', '/dataset/followers/{id}',
+                  action='followers', ckan_icon='group')
+        m.connect('dataset_activity', '/dataset/activity/{id}',
+                  action='activity', ckan_icon='time')
         m.connect('/dataset/activity/{id}/{offset}', action='activity')
         m.connect('/dataset/{id}.{format}', action='read')
-        m.connect('/dataset/{id}', action='read')
+        m.connect('dataset_read', '/dataset/{id}', action='read',
+                  ckan_icon='sitemap')
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource_delete/{resource_id}',
@@ -226,7 +283,8 @@ def make_map():
     # These named routes are used for custom group forms which will use the
     # names below based on the group.type ('group' is the default type)
     with SubMapper(map, controller='group') as m:
-        m.connect('group_index', '/group', action='index')
+        m.connect('group_index', '/group', action='index',
+                  highlight_actions='index search')
         m.connect('group_list', '/group/list', action='list')
         m.connect('group_new',  '/group/new', action='new')
         m.connect('group_action', '/group/{action}/{id}',
@@ -250,7 +308,7 @@ def make_map():
 
     # organizations these basically end up being the same as groups
     with SubMapper(map, controller='organization') as m:
-        m.connect('/organization', action='index')
+        m.connect('organizations_index', '/organization', action='index')
         m.connect('/organization/list', action='list')
         m.connect('/organization/new', action='new')
         m.connect('/organization/{action}/{id}',
@@ -283,16 +341,18 @@ def make_map():
         # Note: openid users have slashes in their ids, so need the wildcard
         # in the route.
         m.connect('/user/activity/{id}/{offset}', action='activity')
-        m.connect('/user/activity/{id}', action='activity')
+        m.connect('user_activity_stream', '/user/activity/{id}',
+                  action='activity', ckan_icon='time')
         m.connect('/dashboard/{offset}', action='dashboard')
         m.connect('/dashboard', action='dashboard')
-        m.connect('/user/follow/{id}', action='follow')
+        m.connect('user_follow', '/user/follow/{id}', action='follow')
         m.connect('/user/unfollow/{id}', action='unfollow')
-        m.connect('/user/followers/{id:.*}', action='followers')
+        m.connect('user_followers', '/user/followers/{id:.*}',
+                  action='followers', ckan_icon='group')
         m.connect('/user/edit/{id:.*}', action='edit')
         m.connect('/user/reset/{id:.*}', action='perform_reset')
-        m.connect('/user/register', action='register')
-        m.connect('/user/login', action='login')
+        m.connect('register', '/user/register', action='register')
+        m.connect('login', '/user/login', action='login')
         m.connect('/user/_logout', action='logout')
         m.connect('/user/logged_in', action='logged_in')
         m.connect('/user/logged_out', action='logged_out')
@@ -300,8 +360,9 @@ def make_map():
         m.connect('/user/reset', action='request_reset')
         m.connect('/user/me', action='me')
         m.connect('/user/set_lang/{lang}', action='set_lang')
-        m.connect('/user/{id:.*}', action='read')
-        m.connect('/user', action='index')
+        m.connect('user_datasets', '/user/{id:.*}', action='read',
+                  ckan_icon='sitemap')
+        m.connect('user_index', '/user', action='index')
 
     with SubMapper(map, controller='revision') as m:
         m.connect('/revision', action='index')
diff --git a/ckan/controllers/related.py b/ckan/controllers/related.py
index d624801cc5e..4b1baefb4b8 100644
--- a/ckan/controllers/related.py
+++ b/ckan/controllers/related.py
@@ -122,7 +122,6 @@ def list(self, id):
         except logic.NotAuthorized:
             base.abort(401, base._('Unauthorized to read package %s') % id)
 
-        c.action = 'related'
         return base.render("package/related_list.html")
 
     def _edit_or_new(self, id, related_id, is_edit):
diff --git a/ckan/i18n/check_po_files.py b/ckan/i18n/check_po_files.py
index a918087d232..10997f3fa3e 100755
--- a/ckan/i18n/check_po_files.py
+++ b/ckan/i18n/check_po_files.py
@@ -11,7 +11,6 @@
 
 '''
 import re
-import polib
 import paste.script.command
 
 def simple_conv_specs(s):
@@ -98,6 +97,8 @@ class CheckPoFiles(paste.script.command.Command):
     parser = paste.script.command.Command.standard_parser(verbose=True)
 
     def command(self):
+        import polib
+
         test_simple_conv_specs()
         test_mapping_keys()
         test_replacement_fields()
diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
index 387371a2f6c..911d32bd9de 100644
--- a/ckan/lib/app_globals.py
+++ b/ckan/lib/app_globals.py
@@ -29,6 +29,38 @@
     'ckan.site_custom_css',
 ]
 
+config_details = {
+    'ckan.favicon': {}, # default gets set in config.environment.py
+    'ckan.template_head_end': {},
+    'ckan.template_footer_end': {},
+        # has been setup in load_environment():
+    'ckan.site_id': {},
+    'ckan.recaptcha.publickey': {'name': 'recaptcha_publickey'},
+    'ckan.recaptcha.privatekey': {'name': 'recaptcha_publickey'},
+    'ckan.template_title_deliminater': {'default': '-'},
+    'ckan.template_head_end': {},
+    'ckan.template_footer_end': {},
+    'ckan.dumps_url': {},
+    'ckan.dumps_format': {},
+    'ckan.api_url': {},
+
+    # split string
+    'search.facets': {'default': 'groups tags res_format license',
+                      'type': 'split',
+                      'name': 'facets'},
+    'package_hide_extras': {'type': 'split'},
+    'plugins': {'type': 'split'},
+
+    # bool
+    'openid_enabled': {'default': 'true', 'type' : 'bool'},
+    'debug': {'default': 'false', 'type' : 'bool'},
+    'ckan.debug_supress_header' : {'default': 'false', 'type' : 'bool'},
+
+    # int
+    'ckan.datasets_per_page': {'default': '20', 'type': 'int'},
+}
+
+
 # A place to store the origional config options of we override them
 _CONFIG_CACHE = {}
 
@@ -143,25 +175,26 @@ def _init(self):
         facets = config.get('search.facets', 'groups tags res_format license capacity')
         self.facets = facets.split()
 
-        # has been setup in load_environment():
-        self.site_id = config.get('ckan.site_id')
-
-        self.template_head_end = config.get('ckan.template_head_end', '')
-        self.template_footer_end = config.get('ckan.template_footer_end', '')
-
-        # hide these extras fields on package read
-        package_hide_extras = config.get('package_hide_extras', '').split()
-        self.package_hide_extras = package_hide_extras
-
-        self.openid_enabled = asbool(config.get('openid_enabled', 'true'))
+        # process the config_details to set globals
+        for name, options in config_details.items():
+            if 'name' in options:
+                key = options['name']
+            elif name.startswith('ckan.'):
+                key = name[5:]
+            else:
+                key = name
+            value = config.get(name, options.get('default', ''))
 
-        self.recaptcha_publickey = config.get('ckan.recaptcha.publickey', '')
-        self.recaptcha_privatekey = config.get('ckan.recaptcha.privatekey', '')
+            data_type = options.get('type')
+            if data_type == 'bool':
+                value = asbool(value)
+            elif data_type == 'int':
+                value = int(value)
+            elif data_type == 'split':
+                value = value.split()
 
-        datasets_per_page = int(config.get('ckan.datasets_per_page', '20'))
-        self.datasets_per_page = datasets_per_page
+            setattr(self, key, value)
 
-        self.debug_supress_header = asbool(config.get('ckan.debug_supress_header', 'false'))
 
 app_globals = _Globals()
 del _Globals
diff --git a/ckan/lib/base.py b/ckan/lib/base.py
index 03c35c2ef1c..fa072e9cdb4 100644
--- a/ckan/lib/base.py
+++ b/ckan/lib/base.py
@@ -128,6 +128,10 @@ def render_template():
 
         # Jinja2 templates
         if template_type == 'jinja2':
+            # We don't want to have the config in templates it should be
+            # accessed via g (app_globals) as this gives us flexability such
+            # as changing via database settings.
+            del globs['config']
             # TODO should we raise error if genshi filters??
             return render_jinja2(template_name, globs)
 
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
index 5cc24fc04b1..fe2b446669e 100644
--- a/ckan/lib/cli.py
+++ b/ckan/lib/cli.py
@@ -1,3 +1,5 @@
+import collections
+import csv
 import os
 import datetime
 import sys
@@ -579,9 +581,12 @@ class UserCmd(CkanCommand):
       user                            - lists users
       user list                       - lists users
       user <user-name>                - shows user properties
-      user add <user-name> [apikey=<apikey>] [password=<password>]
-                                      - add a user (prompts for password if
-                                        not supplied)
+      user add <user-name> [<field>=<value>]
+                                      - add a user (prompts for password
+                                        if not supplied).
+                                        Field can be: apikey
+                                                      password
+                                                      email
       user setpass <user-name>        - set user password (prompts)
       user remove <user-name>         - removes user from users
       user search <query>             - searches for a user name
@@ -678,53 +683,37 @@ def add(self):
 
         if len(self.args) < 2:
             print 'Need name of the user.'
-            return
-        username = self.args[1]
-        user = model.User.by_name(unicode(username))
-        if user:
-            print 'User "%s" already found' % username
             sys.exit(1)
+        username = self.args[1]
 
-        # parse args
-        apikey = None
-        password = None
-        args = self.args[2:]
-        if len(args) == 1 and not (args[0].startswith('password') or \
-                                   args[0].startswith('apikey')):
-            # continue to support the old syntax of just supplying
-            # the apikey
-            apikey = args[0]
-        else:
-            # new syntax: password=foo apikey=bar
-            for arg in args:
-                split = arg.find('=')
-                if split == -1:
-                    split = arg.find(' ')
-                    if split == -1:
-                        raise ValueError('Could not parse arg: %r (expected "--<option>=<value>)")' % arg)
-                key, value = arg[:split], arg[split+1:]
-                if key == 'password':
-                    password = value
-                elif key == 'apikey':
-                    apikey = value
-                else:
-                    raise ValueError('Could not parse arg: %r (expected password/apikey argument)' % arg)
+        # parse args into data_dict
+        data_dict = {'name': username}
+        for arg in self.args[2:]:
+            try:
+                field, value = arg.split('=', 1)
+                data_dict[field] = value
+            except ValueError:
+                raise ValueError('Could not parse arg: %r (expected "<option>=<value>)"' % arg)
 
-        if not password:
-            password = self.password_prompt()
+        if 'password' not in data_dict:
+            data_dict['password'] = self.password_prompt()
 
         print('Creating user: %r' % username)
 
-
-        user_params = {'name': unicode(username),
-                       'password': password}
-        if apikey:
-            user_params['apikey'] = unicode(apikey)
-        user = model.User(**user_params)
-        model.Session.add(user)
-        model.repo.commit_and_remove()
-        user = model.User.by_name(unicode(username))
-        print user
+        try:
+            import ckan.logic as logic
+            site_user = logic.get_action('get_site_user')({'model': model, 'ignore_auth': True}, {})
+            context = {
+                    'model': model,
+                    'session': model.Session,
+                    'ignore_auth': True,
+                    'user': site_user['name'],
+                    }
+            user_dict = logic.get_action('user_create')(context, data_dict)
+            pprint(user_dict)
+        except logic.ValidationError, e:
+            print e
+            sys.exit(1)
 
     def remove(self):
         import ckan.model as model
@@ -943,30 +932,52 @@ def clean(self, user_ratings=True):
             rating.purge()
         model.repo.commit_and_remove()
 
+
+## Used by the Tracking class
+_ViewCount = collections.namedtuple("ViewCount", "id name count")
+
+
 class Tracking(CkanCommand):
     '''Update tracking statistics
 
     Usage:
-      tracking   - update tracking stats
+      tracking update [start-date]        - update tracking stats
+      tracking export <file> [start-date] - export tracking stats to a csv file
     '''
 
     summary = __doc__.split('\n')[0]
     usage = __doc__
-    max_args = 1
-    min_args = 0
+    max_args = 3
+    min_args = 1
 
     def command(self):
         self._load_config()
         import ckan.model as model
         engine = model.meta.engine
 
-        if len(self.args) == 1:
-            # Get summeries from specified date
-            start_date = datetime.datetime.strptime(self.args[0], '%Y-%m-%d')
+        cmd = self.args[0]
+        if cmd == 'update':
+            start_date = self.args[1] if len(self.args) > 1 else None
+            self.update_all(engine, start_date)
+        elif cmd == 'export':
+            if len(self.args) <= 1:
+                print self.__class__.__doc__
+                sys.exit(1)
+            output_file = self.args[1]
+            start_date = self.args[2] if len(self.args) > 2 else None
+            self.update_all(engine, start_date)
+            self.export_tracking(engine, output_file)
+        else:
+            print self.__class__.__doc__
+            sys.exit(1)
+
+    def update_all(self, engine, start_date=None):
+        if start_date:
+            start_date = datetime.datetime.strptime(start_date, '%Y-%m-%d')
         else:
             # No date given. See when we last have data for and get data
             # from 2 days before then in case new data is available.
-            # If no date here then use 2010-01-01 as the start date
+            # If no date here then use 2011-01-01 as the start date
             sql = '''SELECT tracking_date from tracking_summary
                      ORDER BY tracking_date DESC LIMIT 1;'''
             result = engine.execute(sql).fetchall()
@@ -986,6 +997,56 @@ def command(self):
             print 'tracking updated for %s' % start_date
             start_date = stop_date
 
+    def _total_views(self, engine):
+        sql = '''
+            SELECT p.id,
+                   p.name,
+                   COALESCE(SUM(s.count), 0) AS total_views
+               FROM package AS p
+               LEFT OUTER JOIN tracking_summary AS s ON s.package_id = p.id
+               GROUP BY p.id, p.name
+               ORDER BY total_views DESC
+        '''
+        return [_ViewCount(*t) for t in engine.execute(sql).fetchall()]
+
+    def _recent_views(self, engine, measure_from):
+        sql = '''
+            SELECT p.id,
+                   p.name,
+                   COALESCE(SUM(s.count), 0) AS total_views
+               FROM package AS p
+               LEFT OUTER JOIN tracking_summary AS s ON s.package_id = p.id
+               WHERE s.tracking_date >= %(measure_from)s
+               GROUP BY p.id, p.name
+               ORDER BY total_views DESC
+        '''
+        return [_ViewCount(*t) for t in engine.execute(
+                    sql, measure_from=str(measure_from)
+                ).fetchall()]
+
+    def export_tracking(self, engine, output_filename):
+        '''Write tracking summary to a csv file.'''
+        HEADINGS = [
+            "dataset id",
+            "dataset name",
+            "total views",
+            "recent views (last 2 weeks)",
+        ]
+
+        measure_from = datetime.date.today() - datetime.timedelta(days=14)
+        recent_views = self._recent_views(engine, measure_from)
+        total_views = self._total_views(engine)
+
+        with open(output_filename, 'w') as fh:
+            f_out = csv.writer(fh)
+            f_out.writerow(HEADINGS)
+            recent_views_for_id = dict((r.id, r.count) for r in recent_views)
+            f_out.writerows([(r.id,
+                              r.name,
+                              r.count,
+                              recent_views_for_id.get(r.id, 0))
+                              for r in total_views])
+
     def update_tracking(self, engine, summary_date):
         PACKAGE_URL = '/dataset/'
         # clear out existing data before adding new
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index 910cc9abdb2..af6d72b20f9 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -306,7 +306,8 @@ def nav_link(text, controller, **kwargs):
     icon = kwargs.pop('icon', None)
     if icon:
         text = literal('<i class="icon-large icon-%s"></i> ' % icon) + text
-    class_ = _link_class(kwargs)
+    no_active = kwargs.pop('suppress_active_class', False)
+    class_ = _link_class(kwargs, no_active)
     if kwargs.pop('condition', True):
         link = link_to(
             text,
@@ -318,16 +319,22 @@ def nav_link(text, controller, **kwargs):
     return link
 
 
-def _link_class(kwargs):
+def _link_active(kwargs):
     ''' creates classes for the link_to calls '''
-    highlight_actions = kwargs.pop('highlight_actions',
+    highlight_actions = kwargs.get('highlight_actions',
                                    kwargs.get('action', '')).split(' ')
-    if (c.controller == kwargs.get('controller')
-                and c.action in highlight_actions):
+    return (c.controller == kwargs.get('controller')
+                and c.action in highlight_actions)
+
+
+def _link_class(kwargs, suppress_active_class=False):
+    ''' creates classes for the link_to calls '''
+    if not suppress_active_class and _link_active(kwargs):
         active = ' active'
     else:
         active = ''
-    return kwargs.pop('class_', '') + active
+    kwargs.pop('highlight_actions', '')
+    return kwargs.pop('class_', '') + active or None
 
 
 def nav_named_link(text, name, **kwargs):
@@ -381,19 +388,71 @@ def build_nav_main(*args):
     return output
 
 
-def _make_menu_item(menu_item, title):
+def build_nav_icon(menu_item, title, **kw):
+    ''' build a navigation item used for example in user/read_base.html
+
+    outputs <li><a href="..."><i class="icon.."></i> title</a></li>
+
+    :param menu_item: the name of the defined menu item defined in
+    config/routing as the named route of the same name
+    :type menu_item: string
+    :param title: text used for the link
+    :type title: string
+    :param **kw: additional keywords needed for creating url eg id=...
+
+    :rtype: HTML literal
+    '''
+    return _make_menu_item(menu_item, title, **kw)
+
+
+def build_nav(menu_item, title, **kw):
+    ''' build a navigation item used for example breadcrumbs
+
+    outputs <li><a href="..."></i> title</a></li>
+
+    :param menu_item: the name of the defined menu item defined in
+    config/routing as the named route of the same name
+    :type menu_item: string
+    :param title: text used for the link
+    :type title: string
+    :param **kw: additional keywords needed for creating url eg id=...
+
+    :rtype: HTML literal
+    '''
+    return _make_menu_item(menu_item, title, icon=None, **kw)
+
+
+def _make_menu_item(menu_item, title, **kw):
+    ''' build a navigation item used for example breadcrumbs
+
+    outputs <li><a href="..."></i> title</a></li>
+
+    :param menu_item: the name of the defined menu item defined in
+    config/routing as the named route of the same name
+    :type menu_item: string
+    :param title: text used for the link
+    :type title: string
+    :param **kw: additional keywords needed for creating url eg id=...
+
+    :rtype: HTML literal
+
+    This function is called by wrapper functions.
+    '''
+    _menu_items = config['routes.named_routes']
     if menu_item not in _menu_items:
-        log.error('menu item `%s` cannot be found' % menu_item)
-        return literal('<li><a href="#">') + title + literal('</a></li>')
-    item = _menu_items[menu_item]
-    if 'name' in item:
-        link = nav_named_link(title, **item)
-    elif 'url' in item:
-        return literal('<li><a href="%s">' % item.url) + title + literal('</a></li>')
-    else:
-        item = copy.copy(_menu_items[menu_item])
-        controller = item.pop('controller')
-        link = nav_link(title, controller, **item)
+        raise Exception('menu item `%s` cannot be found' % menu_item)
+    item = copy.copy(_menu_items[menu_item])
+    item.update(kw)
+    active =  _link_active(item)
+    controller = item.pop('controller')
+    needed = item.pop('needed')
+    for need in needed:
+        if need not in kw:
+            raise Exception('menu item `%s` need parameter `%s`'
+                            % (menu_item, need))
+    link = nav_link(title, controller, suppress_active_class=True, **item)
+    if active:
+        return literal('<li class="active">') + link + literal('</li>')
     return literal('<li>') + link + literal('</li>')
 
 
@@ -572,7 +631,7 @@ def markdown_extract(text, extract_length=190):
     plain = re.sub(r'<.*?>', '', markdown(text))
     if not extract_length or len(plain) < extract_length:
         return plain
-    return truncate(plain, length=extract_length, indicator='...', whole_word=True)
+    return literal(unicode(truncate(plain, length=extract_length, indicator='...', whole_word=True)))
 
 
 def icon_url(name):
@@ -1411,6 +1470,8 @@ def resource_preview(resource, pkg_id):
            'include_resource',
            'urls_for_resource',
            'build_nav_main',
+           'build_nav_icon',
+           'build_nav',
            'debug_inspect',
            'dict_list_reduce',
            'full_current_url',
diff --git a/ckan/public/base/javascript/modules/popover-context.js b/ckan/public/base/javascript/modules/popover-context.js
index b3fdb188656..31651eef06e 100644
--- a/ckan/public/base/javascript/modules/popover-context.js
+++ b/ckan/public/base/javascript/modules/popover-context.js
@@ -155,7 +155,7 @@ this.ckan.module('popover-context', function($, _) {
 				// has this been rendered before?
 				if (typeof window.popover_context.render[type][id] == 'undefined') {
 					var params = this.sanitiseParams(json.result);
-					client.getTemplate('popover-context-' + type + '.html', params, this._onRenderPopover);
+					client.getTemplate('popover_context_' + type + '.html', params, this._onRenderPopover);
 				} else {
 				 	this._onRenderPopover(window.popover_context.render[type][id]);
 				}
diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
index 50eb9fdbd11..14f81fc5cff 100644
--- a/ckan/public/base/less/masthead.less
+++ b/ckan/public/base/less/masthead.less
@@ -36,7 +36,7 @@ header.masthead {
 			font-weight: 900;
 			letter-spacing: -1px;
 		}
-		h2 { 
+		h2 {
 			position: absolute;
 			bottom: -3px;
 			left: 0;
@@ -198,5 +198,4 @@ header.masthead {
 		left: 10px;
 		color: rgba(255, 255, 255, 0.5);
 	}
-
 }
diff --git a/ckan/templates/ajax_snippets/popover-context-dataset.html b/ckan/templates/ajax_snippets/popover_context_dataset.html
similarity index 100%
rename from ckan/templates/ajax_snippets/popover-context-dataset.html
rename to ckan/templates/ajax_snippets/popover_context_dataset.html
diff --git a/ckan/templates/ajax_snippets/popover-context-group.html b/ckan/templates/ajax_snippets/popover_context_group.html
similarity index 100%
rename from ckan/templates/ajax_snippets/popover-context-group.html
rename to ckan/templates/ajax_snippets/popover_context_group.html
diff --git a/ckan/templates/ajax_snippets/popover-context-user.html b/ckan/templates/ajax_snippets/popover_context_user.html
similarity index 98%
rename from ckan/templates/ajax_snippets/popover-context-user.html
rename to ckan/templates/ajax_snippets/popover_context_user.html
index 5e7fbef5b62..015e5dd32c5 100644
--- a/ckan/templates/ajax_snippets/popover-context-user.html
+++ b/ckan/templates/ajax_snippets/popover_context_user.html
@@ -12,7 +12,7 @@
 			<i class="icon-eye-open"></i>
 			View Profile
 		</a>
-	</div>	
+	</div>
 	<div class="nums">
 		<dl>
 			<dt>{{ _('Followers') }}</dt>
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index fd064b12f39..ab67344d81b 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -10,6 +10,10 @@
 <!--[if gt IE 8]><!--> <html lang="{{ lang }}"> <!--<![endif]-->
 {%- endblock -%}
 
+<!-- 
+{{ g }}
+-->
+
   {# Allows custom attributes to be added to the <head> tag #}
   <head{% block headtag %}{% endblock %}>
     {#
@@ -41,7 +45,7 @@
     <title>
       {%- block title -%}
         {%- block subtitle %}{% endblock -%}
-        {%- if self.subtitle()|trim %} {{ config.template_title_delimiter or '-' }} {% endif -%}
+        {%- if self.subtitle()|trim %} {{ g.template_title_deliminater }} {% endif -%}
         {{ g.site_title }}
       {%- endblock -%}
     </title>
@@ -51,9 +55,7 @@
     such as rss feeds and favicons in the same way as the meta block.
     #}
     {% block links -%}
-    {%- with favicon = config.get('ckan.favicon') or h.url_for_static('/base/images/ckan.ico') -%}
-      <link rel="shortcut icon" href="{{ favicon }}" />
-    {% endwith -%}
+      <link rel="shortcut icon" href="{{ g.favicon }}" />
     {% endblock -%}
 
     {#
@@ -72,9 +74,9 @@
       {% resource g.main_css[6:] %}
     {% endblock %}
 
-    {# defined in the config.ini under "ckan.template_head_end" #}
     {% block head_extras %}
-      {{ config.get('ckan.template_head_end', '') | safe }}
+      {# defined in the config.ini under "ckan.template_head_end" #}
+      {{ g.template_head_end | safe }}
     {% endblock %}
 
     {%- block custom_styles %}
@@ -87,7 +89,7 @@
   </head>
 
   {# Allows custom attributes to be added to the <body> tag #}
-  <body{% block bodytag %} data-site-root="{{ h.url('/', locale='default', qualified=true) }}" data-locale-root="{{ h.url('/', qualified=true) }}" data-api-root="{{ config.get('ckan.api_url', '') }}"{% endblock %}>
+  <body{% block bodytag %} data-site-root="{{ h.url('/', locale='default', qualified=true) }}" data-locale-root="{{ h.url('/', qualified=true) }}" data-api-root="{{ g.api_url }}"{% endblock %}>
 
     {#
     The page block allows you to add content to the page. Most of the time it is
@@ -119,9 +121,9 @@
     {%- block scripts %}
     {% endblock -%}
 
-    {# defined in the config.ini under "ckan.template_footer_end" #}
     {% block body_extras -%}
-      {{ config.get('ckan.template_footer_end', '') | safe }}
+      {# defined in the config.ini under "ckan.template_footer_end" #}
+      {{ g.template_footer_end | safe }}
     {%- endblock %}
   </body>
 </html>
diff --git a/ckan/templates/development/primer.html b/ckan/templates/development/primer.html
index 0641b057eec..cd55f55bbff 100644
--- a/ckan/templates/development/primer.html
+++ b/ckan/templates/development/primer.html
@@ -33,6 +33,7 @@
     {% snippet 'development/snippets/form.html', error=['This field has an error'] %}
 
     <section class="module">
+      {% snippet 'development/snippets/page_header.html' %}
       <div class="module-content">
         <h1 class="page-heading">Top level heading (h1)</h1>
         <h2>Some Rendered Markdown (h2)</h2>
diff --git a/ckan/templates/development/snippets/page_header.html b/ckan/templates/development/snippets/page_header.html
new file mode 100644
index 00000000000..2be95a479d5
--- /dev/null
+++ b/ckan/templates/development/snippets/page_header.html
@@ -0,0 +1,8 @@
+{% with items=(
+h.literal('<li>') + h.link_to('In-active Tab', '#') + h.literal('</li>'),
+h.literal('<li class="active">') + h.link_to('Active Tab', '#') + h.literal('</li>'),
+h.literal('<li>') + h.link_to('In-active Tab', '#') + h.literal('</li>'),
+h.literal('<li>') + h.link_to('In-active Tab', '#') + h.literal('</li>'),
+) %}
+	{% snippet 'snippets/page_header.html', items=items %}
+{% endwith %}
diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html
index dccb1095f86..e17195d97c1 100644
--- a/ckan/templates/footer.html
+++ b/ckan/templates/footer.html
@@ -29,7 +29,7 @@
   </div>
 
   {% block footer_debug %}
-    {% if config.debug %}
+    {% if g.debug %}
       {% include 'snippets/debug.html' %}
     {% endif %}
   {% endblock %}
diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
index b566ce8d80e..e12e667c848 100644
--- a/ckan/templates/group/read.html
+++ b/ckan/templates/group/read.html
@@ -1,90 +1,10 @@
-{% extends "page.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
 
-{% block breadcrumb_content %}
-  <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
-  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
-{% endblock %}
-
-{% block actions_content %}
-  {% if h.check_access('group_member_create', {'id': c.group_dict.id}) %}
-    <li>{% link_for _('Members'), controller='group', action='members', id=c.group_dict.id, class_='btn' %}</li>
-  {% endif %}
-  {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
-    <li>{% link_for _('Add Dataset to Group'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus' %}</li>
-    <li>{% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}</li>
-  {% endif %}
-  <li>{{ h.follow_button('group', c.group_dict.id) }}</li>
-{% endblock %}
-
-{% block primary_content %}
-  <section class="module">
-    {% block package_header %}
-      <header class="module-content page-header">
-        <ul class="nav nav-tabs">
-          <li{% if c.action == 'read' %} class="active"{% endif %}>
-            {% link_for _('Datasets'), controller='group', action='read', id=c.group_dict.name, icon='sitemap' %}
-          </li>
-          <li{% if c.action == 'activity' %} class="active"{% endif %}>
-            {% link_for _('Activity Stream'), controller='group', action='activity', id=c.group_dict.name, icon='time' %}
-          </li>
-          <li{% if c.action == 'followers' %} class="active"{% endif %}>
-            {% link_for _('Followers'), controller='group', action='followers', id=c.group_dict.name, icon='group' %}
-          </li>
-          <li{% if c.action == 'admins' %} class="active"{% endif %}>
-            {% link_for _('Administrators'), controller='group', action='admins', id=c.group_dict.name, icon='cog' %}
-          </li>
-          <li{% if c.action == 'about' %} class="active"{% endif %}>
-            {% link_for _('About'), controller='group', action='about', id=c.group_dict.name, icon='info-sign' %}
-          </li>
-        </ul>
-      </header>
-    {% endblock %}
-    {% block primary_content_inner %}
-      <div class="module-content">
-        {% include "package/snippets/search_form.html" %}
-      </div>
-      {{ c.page.pager(q=c.q) }}
-    {% endblock %}
-  </section>
-{% endblock %}
-
-{% block secondary_content %}
-  <div class="module profile-info">
-    <section class="module-content">
-      <div class="avatar">
-        <a href="{{ c.group_dict.url }}">
-          <img src="{{ c.group_dict.image_url or h.url_for_static('/base/images/placeholder-group.png') }}" width="200" height="125" alt="{{ c.group_dict.name }}" />
-        </a>
-      </div>
-      <h1 class="heading">{{ c.group_dict.display_name }}</h1>
-      {% if c.group_dict.description %}
-        <p>
-          {{ h.markdown_extract(c.group_dict.description, 180) }}
-          {% link_for _('read more'), controller='group', action='about', id=c.group_dict.name %}
-        </p>
-      {% else %}
-        <p class="empty">{{ _('There is no description for this group') }}</p>
-      {% endif %}
-      <div class="nums">
-        <dl>
-          <dt>{{ _('Followers') }}</dt>
-          <dd>{{ c.group_dict.num_followers }}</dd>
-        </dl>
-        <dl>
-          <dt>{{ _('Datasets') }}</dt>
-          <dd>{{ c.group_dict.packages|length }}</dd>
-        </dl>
-      </div>
-    </section>
+{% block primary_content_inner %}
+  <div class="module-content">
+    {% include "package/snippets/search_form.html" %}
   </div>
-
-  {{ h.snippet('snippets/facet_list.html', title='Tags', name='tags', extras={'id':c.group_dict.id}) }}
-  {{ h.snippet('snippets/facet_list.html', title='Formats', name='res_format', extras={'id':c.group_dict.id}) }}
-{% endblock %}
-
-{% block links %}
-  {{ super() }}
-  {% include "group/snippets/feeds.html" %}
+  {{ c.page.pager(q=c.q) }}
 {% endblock %}
diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
new file mode 100644
index 00000000000..5e36a3763b6
--- /dev/null
+++ b/ckan/templates/group/read_base.html
@@ -0,0 +1,87 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li>{% link_for _('Groups'), controller='group', action='index' %}</li>
+  <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
+{% endblock %}
+
+{% block actions_content %}
+  {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
+    <li>{% link_for _('Add Dataset to Group'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus' %}</li>
+    <li>{% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}</li>
+  {% endif %}
+  <li>{{ h.follow_button('group', c.group_dict.id) }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    {% block package_header %}
+      <header class="module-content page-header">
+        <ul class="nav nav-tabs">
+          <li{% if c.action == 'read' %} class="active"{% endif %}>
+            {% link_for _('Datasets'), controller='group', action='read', id=c.group_dict.name, icon='sitemap' %}
+          </li>
+          <li{% if c.action == 'activity' %} class="active"{% endif %}>
+            {% link_for _('Activity Stream'), controller='group', action='activity', id=c.group_dict.name, icon='time' %}
+          </li>
+          <li{% if c.action == 'followers' %} class="active"{% endif %}>
+            {% link_for _('Followers'), controller='group', action='followers', id=c.group_dict.name, icon='group' %}
+          </li>
+          <li{% if c.action == 'admins' %} class="active"{% endif %}>
+            {% link_for _('Administrators'), controller='group', action='admins', id=c.group_dict.name, icon='cog' %}
+          </li>
+          <li{% if c.action == 'about' %} class="active"{% endif %}>
+            {% link_for _('About'), controller='group', action='about', id=c.group_dict.name, icon='info-sign' %}
+          </li>
+        </ul>
+      </header>
+    {% endblock %}
+    {% block primary_content_inner %}
+      <div class="module-content">
+        {% include "package/snippets/search_form.html" %}
+      </div>
+      {{ c.page.pager(q=c.q) }}
+    {% endblock %}
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  <div class="module profile-info">
+    <section class="module-content">
+      <div class="avatar">
+        <a href="{{ c.group_dict.url }}">
+          <img src="{{ c.group_dict.image_url or h.url_for_static('/base/images/placeholder-group.png') }}" width="200" height="125" alt="{{ c.group_dict.name }}" />
+        </a>
+      </div>
+      <h1 class="heading">{{ c.group_dict.display_name }}</h1>
+      {% if c.group_dict.description %}
+        <p>
+          {{ h.markdown_extract(c.group_dict.description, 180) }}
+          {% link_for _('read more'), controller='group', action='about', id=c.group_dict.name %}
+        </p>
+      {% else %}
+        <p class="empty">{{ _('There is no description for this group') }}</p>
+      {% endif %}
+      <div class="nums">
+        <dl>
+          <dt>{{ _('Followers') }}</dt>
+          <dd>{{ c.group_dict.num_followers }}</dd>
+        </dl>
+        <dl>
+          <dt>{{ _('Datasets') }}</dt>
+          <dd>{{ c.group_dict.packages|length }}</dd>
+        </dl>
+      </div>
+    </section>
+  </div>
+
+  {{ h.snippet('snippets/facet_list.html', title='Tags', name='tags', extras={'id':c.group_dict.id}) }}
+  {{ h.snippet('snippets/facet_list.html', title='Formats', name='res_format', extras={'id':c.group_dict.id}) }}
+{% endblock %}
+
+{% block links %}
+  {{ super() }}
+  {% include "group/snippets/feeds.html" %}
+{% endblock %}
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
index c34db9c915e..b267796cf52 100644
--- a/ckan/templates/header.html
+++ b/ckan/templates/header.html
@@ -1,5 +1,5 @@
 <header class="masthead">
-  {% if config.debug and not g.debug_supress_header %}
+  {% if g.debug and not g.debug_supress_header %}
     <div class="debug">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
   {% endif %}
   <div class="container">
@@ -17,7 +17,13 @@ <h1>
     <div class="content">
       <nav class="section navigation">
         <ul class="unstyled">
-          {{ h.build_nav_main(('add dataset', _('Add Dataset'), 'package_create'), ('search', _('Datasets')), ('organizations', _('Organizations')), ('default_group', _('Groups')), ('about', _('About'))) }}
+          {{ h.build_nav_main(
+            ('add dataset', _('Add Dataset'), 'package_create'),
+            ('search', _('Datasets')),
+            ('organizations_index', _('Organizations')),
+            ('group_index', _('Groups')),
+            ('about', _('About'))
+          ) }}
         </ul>
       </nav>
       <form class="section site-search simple-input" action="{% url_for controller='package', action='search' %}" method="get">
diff --git a/ckan/templates/organization/new.html b/ckan/templates/organization/new.html
index 859db1ee3b9..ce94e0848e4 100644
--- a/ckan/templates/organization/new.html
+++ b/ckan/templates/organization/new.html
@@ -5,3 +5,9 @@
 {% block breadcrumb_link %}{{ h.nav_link(_('Create Organization'), controller='organization', action='edit', id=c.organization.name) }}{% endblock %}
 
 {% block page_heading %}{{ _('Create a Organization') }}{% endblock %}
+
+{% block primary_content_header %}{% endblock %}
+
+{% block breadcrumb_content_inner %}
+  <li class="active"><a href="#">{{ _('Create a Organization') }}</a></li>
+{% endblock %}
\ No newline at end of file
diff --git a/ckan/templates/package/activity.html b/ckan/templates/package/activity.html
index ee0e2dd7fc0..eae593c36f5 100644
--- a/ckan/templates/package/activity.html
+++ b/ckan/templates/package/activity.html
@@ -1,8 +1,8 @@
-{% extends "package/read.html" %}
+{% extends "package/read_base.html" %}
 
 {% block subtitle %}{{ _('Activity Stream') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %}
 
-{% block package_content %}
+{% block primary_content_inner %}
   <section class="module-content">
     <h1 class="hide-heading">{{ _('Activity Stream') }}</h1>
     {{ c.package_activity_stream | safe }}
diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html
index b3a1c4fc898..418872de25b 100644
--- a/ckan/templates/package/followers.html
+++ b/ckan/templates/package/followers.html
@@ -1,8 +1,8 @@
-{% extends "package/read.html" %}
+{% extends "package/read_base.html" %}
 
 {% block subtitle %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %}
 
-{% block package_content %}
+{% block primary_content_inner %}
   <section class="module-content">
     <h1 class="hide-heading">{{ _('Followers') }}</h1>
     {% snippet "user/snippets/followers.html", followers=c.followers %}
diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
index 3f4d4963a54..0c810f8112d 100644
--- a/ckan/templates/package/read.html
+++ b/ckan/templates/package/read.html
@@ -1,131 +1,38 @@
-{% extends "page.html" %}
+{% extends "package/read_base.html" %}
 
 {% set pkg = c.pkg_dict %}
 
 {% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
 
-{% block breadcrumb_content %}
-  {% set dataset = pkg.title or pkg.name %}
-  <li>{% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}</li>
-  <li class="active"><a href="" title="{{ dataset }}">{{ dataset|truncate(35) }}</a></li>
-{% endblock %}
-
-{% block actions_content %}
-  {# NOTE: Not implemented in stage 1 #}
-  {# <li>{% link_for _('History'), controller='package', action='history', id=pkg.name, class_='btn', icon='undo' %}</li> #}
-  {% if h.check_access('package_update', {'id':pkg.id }) %}
-    <li>{% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn btn-primary', icon='wrench' %}</li>
-  {% endif %}
-  <li>{{ h.follow_button('dataset', pkg.id) }}</li>
-{% endblock %}
-
-{% block primary_content %}
-  {% block package_revision_info %}
-    {% if c.pkg_revision_id %}
-      <div class="module info">
-        <p class="module-content">
-          {% set timestamp = h.render_datetime(c.pkg_revision_timestamp, with_hours=True) %}
-          {% set url =  h.url(controller='package', action='read', id=pkg.name) %}
-
-          {% if c.pkg_revision_not_latest %}
-            {% trans timestamp=timestamp, url=url %}This is an old revision of this dataset, as edited at {{ timestamp }}. It may differ significantly from the <a href="{{ url }}">current revision</a>.{% endtrans %}
-          {% else %}
-            {% trans timestamp=timestamp %}This is the current revision of this dataset, as edited at {{ timestamp }}.{% endtrans %}
-          {% endif %}
+{% block primary_content_inner %}
+
+  {% block package_description %}
+    <section class="module-content">
+      <h1>{{ pkg.title or pkg.name }}
+        {% if pkg.state.startswith('draft') %}
+          [{{ _('Draft') }}]
+        {% endif %}
+      </h1>
+      {% if c.pkg_notes_formatted %}
+        <div class="notes embedded-content">
+          {{ c.pkg_notes_formatted }}
         </div>
-      </div>
-    {% endif %}
-  {% endblock %}
-
-  <article class="module prose">
-
-    {% block package_header %}
-      <header class="module-content page-header">
-        <ul class="nav nav-tabs">
-          <li{% if c.action == 'read' %} class="active"{% endif %}>
-            {% link_for _('Dataset'), controller='package', action='read', id=pkg.name, icon='sitemap' %}
-          </li>
-          <li{% if c.action == 'activity' %} class="active"{% endif %}>
-            {% link_for _('Activity Stream'), controller='package', action='activity', id=pkg.name, icon='time' %}
-          </li>
-          <li{% if c.action == 'followers' %} class="active"{% endif %}>
-            {% link_for _('Followers'), controller='package', action='followers', id=pkg.name, icon='group' %}
-          </li>
-          <li{% if c.action == 'related' %} class="active"{% endif %}>
-            {% link_for _('Related'), controller='related', action='list', id=pkg.name, icon='picture' %}
-          </li>
-        </ul>
-      </header>
-    {% endblock %}
-
-    {% block package_content %}
-
-      {% block package_description %}
-        <section class="module-content">
-          <h1>{{ pkg.title or pkg.name }}
-            {% if pkg.state.startswith('draft') %}
-              [{{ _('Draft') }}]
-            {% endif %}
-          </h1>
-          {% if c.pkg_notes_formatted %}
-            <div class="notes embedded-content">
-              {{ c.pkg_notes_formatted }}
-            </div>
-          {% endif %}
-          <span class="insert-comment-thread"></span>
-        </section>
-      {% endblock %}
-
-      {% block package_resources %}
-        {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
-      {% endblock %}
-
-      {% block package_tags %}
-        {% snippet "package/snippets/tags.html", tags=pkg.tags %}
-      {% endblock %}
-
-      {% block package_additional_info %}
-        {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
-      {% endblock %}
-
-    {% endblock %}
-  </article>
-{% endblock %}
-
-{% block secondary_content %}
-
-  {% block secondary_help_content %}{% endblock %}
-
-  {% block package_org %}
-    {% if pkg.organization %}
-      {% snippet "snippets/organization.html", organization=pkg.organization, truncate=70 %}
-    {% endif %}
-  {% endblock %}
-
-  {% block package_private %}
-    {% if pkg.private %}
-      {% snippet "snippets/private.html" %}
-    {% endif %}
+      {% endif %}
+      {# FIXME why is this here? seems wrong #}
+      <span class="insert-comment-thread"></span>
+    </section>
   {% endblock %}
 
-  {% if not pkg.private %}
-    {% block package_groups %}
-      {% for group in pkg.groups %}
-        {% snippet "snippets/group.html", group=group, truncate=70 %}
-      {% endfor %}
-    {% endblock %}
-  {% endif %}
-
-  {% block package_social %}
-    {% snippet "snippets/social.html" %}
+  {% block package_resources %}
+    {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
   {% endblock %}
 
-  {% block package_related %}
-    {% snippet "snippets/related.html", item=c.pkg.related|last, pkg_name=pkg.name %}
+  {% block package_tags %}
+    {% snippet "package/snippets/tags.html", tags=pkg.tags %}
   {% endblock %}
 
-  {% block package_license %}
-    {% snippet "snippets/license.html", pkg_dict=pkg %}
+  {% block package_additional_info %}
+    {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
   {% endblock %}
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
new file mode 100644
index 00000000000..9a3d838ceb8
--- /dev/null
+++ b/ckan/templates/package/read_base.html
@@ -0,0 +1,77 @@
+{% extends "page.html" %}
+
+{% set pkg = c.pkg_dict %}
+
+{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {% set dataset = pkg.title or pkg.name %}
+  <li>{% link_for _('Datasets'), controller='package', action='search', highlight_actions = 'new index' %}</li>
+  <li class="active"><a href="" title="{{ dataset }}">{{ dataset|truncate(35) }}</a></li>
+{% endblock %}
+
+{% block actions_content %}
+  {# NOTE: Not implemented in stage 1 #}
+  {# <li>{% link_for _('History'), controller='package', action='history', id=pkg.name, class_='btn', icon='undo' %}</li> #}
+  {% if h.check_access('package_update', {'id':pkg.id }) %}
+    <li>{% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn btn-primary', icon='wrench' %}</li>
+  {% endif %}
+  <li>{{ h.follow_button('dataset', pkg.id) }}</li>
+{% endblock %}
+
+{% block primary_content %}
+  {% block package_revision_info %}
+    {% if c.pkg_revision_id %}
+      <div class="module info">
+        <p class="module-content">
+          {% set timestamp = h.render_datetime(c.pkg_revision_timestamp, with_hours=True) %}
+          {% set url =  h.url(controller='package', action='read', id=pkg.name) %}
+
+          {% if c.pkg_revision_not_latest %}
+            {% trans timestamp=timestamp, url=url %}This is an old revision of this dataset, as edited at {{ timestamp }}. It may differ significantly from the <a href="{{ url }}">current revision</a>.{% endtrans %}
+          {% else %}
+            {% trans timestamp=timestamp %}This is the current revision of this dataset, as edited at {{ timestamp }}.{% endtrans %}
+          {% endif %}
+        </div>
+      </div>
+    {% endif %}
+  {% endblock %}
+
+  <article class="module prose">
+
+    {% block page_header %}
+      {% snippet 'snippets/page_header.html', items=[
+          h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name),
+          h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name),
+          h.build_nav_icon('dataset_followers', _('Followers'), id=pkg.name),
+          h.build_nav_icon('related_list', _('Related'), id=pkg.name),
+        ] %}
+    {% endblock %}
+
+    {% block primary_content_inner %}{% endblock %}
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+
+  {% block secondary_help_content %}{% endblock %}
+
+  {% block package_groups %}
+    {% for group in pkg.groups %}
+      {% snippet "snippets/group.html", group=group, truncate=70 %}
+    {% endfor %}
+  {% endblock %}
+
+  {% block package_social %}
+    {% snippet "snippets/social.html" %}
+  {% endblock %}
+
+  {% block package_related %}
+    {% snippet "snippets/related.html", item=c.pkg.related|last, pkg_name=pkg.name %}
+  {% endblock %}
+
+  {% block package_license %}
+    {% snippet "snippets/license.html", pkg_dict=pkg %}
+  {% endblock %}
+
+{% endblock %}
diff --git a/ckan/templates/package/related_list.html b/ckan/templates/package/related_list.html
index f67d487d15a..e7a566c55ec 100644
--- a/ckan/templates/package/related_list.html
+++ b/ckan/templates/package/related_list.html
@@ -1,8 +1,8 @@
-{% extends "package/read.html" %}
+{% extends "package/read_base.html" %}
 
 {% set pkg = c.pkg %}
 
-{% block package_content %}
+{% block primary_content_inner %}
   <section class="module-content">
     <h2 class="hide-heading">{{ _('Related Media for {dataset}').format(dataset=h.dataset_display_name(c.pkg)) }}</h2>
     {% if c.pkg.related %}
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index eae87ef39ec..0f6f5c6d849 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -32,7 +32,7 @@
     </li>
   {% endif %}
 
-  {% if 'datastore' in config.get('ckan.plugins') %}
+  {% if 'datastore' in g.plugins %}
     <li>{% snippet 'package/snippets/data_api_button.html', resource=res, datastore_root_url=c.datastore_api %}</li>
   {% endif %}
 {% endblock %}
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index e75f7c649ff..d47f2051a3b 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -75,8 +75,8 @@
       You can also access this registry using the {{ h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=1)) }}
       <!--! FIXME the API Docs link should be for the version of ckan being used but the dev version of ckan needs to point to latest so not trivial -->
       (see {{ h.link_to(_('API Docs'), 'http://docs.ckan.org/en/latest/api.html') }})
-      {% if config.get('ckan.dumps_url') -%}
-        or download a <a href="{{ config.get('ckan.dumps_url') }}">full {{ config.get('ckan.dumps_format', '') }} dump</a>
+      {% if g.dumps_url -%}
+        or download a <a href="{{ g.dumps_url }}">full {{ g.dumps_format }} dump</a>
       {%- endif %}.
     </small>
   </section>
diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index 1bab2909dc6..8e9ecebb63f 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -97,7 +97,7 @@ <h2>A sidebar item</h2>
 {%- block scripts %}
     {% resource 'base/main' %}
     {% resource 'base/ckan' %}
-    {% if config.get('ckan.tracking_enabled', 'false') %}
+    {% if g.tracking_enabled %}
         {% resource 'base/tracking.js' %}
     {% endif %}
   {{ super() }}
diff --git a/ckan/templates/snippets/page_header.html b/ckan/templates/snippets/page_header.html
new file mode 100644
index 00000000000..a75d1b0fec4
--- /dev/null
+++ b/ckan/templates/snippets/page_header.html
@@ -0,0 +1,7 @@
+<header class="module-content page-header">
+  <ul class="nav nav-tabs">
+    {% for item in items %}
+      {{ item }}
+    {% endfor %}
+  </ul>
+</header>
diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
index 8b00ee5a9d1..9a272ecfa3e 100644
--- a/ckan/templates/user/read.html
+++ b/ckan/templates/user/read.html
@@ -1,119 +1,23 @@
-{% extends "page.html" %}
-
-{% set user = c.user_dict %}
+{% extends "user/read_base.html" %}
 
 {% block subtitle %}{{ user.display_name }}{% endblock %}
 
-{% block breadcrumb_content %}
-  <li>{% link_for _('Users'), controller='user', action='index' %}</li>
-  <li class="active">{% link_for user.display_name|truncate(35), controller='user', action='read', id=user.name %}</li>
-{% endblock %}
-
-{% block actions_content %}
-{% if h.check_access('user_update', user) %}
-  <li>{% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %}</li>
-{% endif %}
-{% if c.is_myself == false %}
-  <li>{{ h.follow_button('user', user.id) }}</li>
-{% endif %}
-{% endblock %}
-
-{% block primary_content %}
-  <article class="module profile">
-    <header class="module-content page-header">
-      <ul class="nav nav-tabs">
-        <li{% if c.action == 'read' or c.action == 'me' %} class="active"{% endif %}>
-          {% link_for _('Datasets'), controller='user', action='read', id=user.name, icon='sitemap' %}
-        </li>
-        <li{% if c.action == 'activity' %} class="active"{% endif %}>
-          {% link_for _('Activity Stream'), controller='user', action='activity', id=user.name, icon='time' %}
-        </li>
-        <li{% if c.action == 'followers' %} class="active"{% endif %}>
-          {% link_for _('Followers'), controller='user', action='followers', id=user.name, icon='group' %}
-        </li>
-      </ul>
-    </header>
-    <section class="module-content">
-      {% block primary_content_inner %}
-        <h2 class="hide-heading">{{ _('Datasets') }}</h2>
-        {% if user.datasets %}
-          {% snippet 'snippets/package_list.html', packages=user.datasets %}
-        {% else %}
-
-          {% if c.is_myself %}
-            <p class="empty">
-              {{ _('You haven\'t created any datasets.') }}
-              {% link_for _('Create one now?'), controller='package', action='new' %}.
-            </p>
-          {% else %}
-            <p class="empty">
-              {{ _('User hasn\'t created any datasets.') }}
-            </p>
-          {% endif %}
+{% block primary_content_inner %}
+  <h2 class="hide-heading">{{ _('Datasets') }}</h2>
+  {% if user.datasets %}
+    {% snippet 'snippets/package_list.html', packages=user.datasets %}
+  {% else %}
 
-        {% endif %}
-      {% endblock %}
-    </section>
-  </article>
-{% endblock %}
-
-{% block secondary_content %}
-<div class="module profile-info">
-  <section class="module-content">
-    <div class="avatar">{{ h.linked_gravatar(user.email_hash, 180) }}</div>
-    <h1 class="heading">{{ user.fullname or _('No full name provided') }}</h1>
-    {% if c.about_formatted %}
-      {{ c.about_formatted }}
+    {% if c.is_myself %}
+      <p class="empty">
+        {{ _('You haven\'t created any datasets.') }}
+        {% link_for _('Create one now?'), controller='package', action='new' %}.
+      </p>
     {% else %}
       <p class="empty">
-        {% if c.is_myself %}
-          {% trans %}You have not provided a biography.{% endtrans %}
-        {% else %}
-          {% trans %}This user has no biography.{% endtrans %}
-        {% endif %}
+        {{ _('User hasn\'t created any datasets.') }}
       </p>
     {% endif %}
-    <div class="nums">
-      <dl>
-        <dt>{{ _('Followers') }}</dt>
-        <dd>{{ user.num_followers }}</dd>
-      </dl>
-      <dl>
-        <dt>{{ _('Datasets') }}</dt>
-        <dd>{{ user.number_administered_packages }}</dd>
-      </dl>
-      <dl>
-        <dt>{{ _('Edits') }}</dt>
-        <dd>{{ user.number_of_edits }}</dd>
-      </dl>
-    </div>
-    <div class="info">
-      <dl>
-        {% if user.name.startswith('http://') or user.name.startswith('https://') %}
-          <dt>{{ _('Open ID') }}</dt>
-          <dd>{{ user.name|urlize(25) }}{# Be great if this just showed the domain #}</dd>
-        {% else %}
-          <dt>{{ _('Username') }}</dt>
-          <dd>{{ user.name }}</dd>
-        {% endif %}
-      </dl>
-      {% if c.is_myself %}
-      <dl>
-        <dt>{{ _('Email') }} <span class="label" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
-        <dd>{{ user.email }}</dd>
-      </dl>
-      {% endif %}
-      <dl>
-        <dt>{{ _('Member Since') }}</dt>
-        <dd>{{ h.render_datetime(user.created) }}</dd>
-      </dl>
-      {% if c.is_myself %}
-      <dl>
-        <dt class="key">{{ _('API Key') }} <span class="label" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
-        <dd class="value"><code>{{ user.apikey }}</code></dd>
-      </dl>
-      {% endif %}
-    </div>
-  </section>
-</div>
-{% endblock %}
+
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
new file mode 100644
index 00000000000..124a324ce1b
--- /dev/null
+++ b/ckan/templates/user/read_base.html
@@ -0,0 +1,97 @@
+{% extends "page.html" %}
+
+{% set user = c.user_dict %}
+
+{% block subtitle %}{{ user.display_name }}{% endblock %}
+
+{% block breadcrumb_content %}
+  {{ h.build_nav('user_index', _('Users')) }}
+  {{ h.build_nav('user_datasets', user.display_name|truncate(35), id=user.name) }}
+{% endblock %}
+
+{% block actions_content %}
+{% if h.check_access('user_update', user) %}
+  <li>{% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %}</li>
+{% endif %}
+{% if c.is_myself == false %}
+  <li>{{ h.follow_button('user', user.id) }}</li>
+{% endif %}
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module profile">
+    {% block page_header %}
+      {% snippet 'snippets/page_header.html', items=[
+          h.build_nav_icon('user_datasets', _('Datasets'), id=user.name),
+          h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name),
+          h.build_nav_icon('user_followers', _('Followers'), id=user.name),
+        ] %}
+    {% endblock %}
+    <section class="module-content">
+      {% block primary_content_inner %}{% endblock %}
+    </section>
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+<div class="module profile-info">
+  <section class="module-content">
+    {% block secondary_content_inner %}
+      <div class="avatar">{{ h.linked_gravatar(user.email_hash, 180) }}</div>
+      <h1 class="heading">{{ user.fullname or _('No full name provided') }}</h1>
+      {% if c.about_formatted %}
+        {{ c.about_formatted }}
+      {% else %}
+        <p class="empty">
+          {% if c.is_myself %}
+            {% trans %}You have not provided a biography.{% endtrans %}
+          {% else %}
+            {% trans %}This user has no biography.{% endtrans %}
+          {% endif %}
+        </p>
+      {% endif %}
+      <div class="nums">
+        <dl>
+          <dt>{{ _('Followers') }}</dt>
+          <dd>{{ user.num_followers }}</dd>
+        </dl>
+        <dl>
+          <dt>{{ _('Datasets') }}</dt>
+          <dd>{{ user.number_administered_packages }}</dd>
+        </dl>
+        <dl>
+          <dt>{{ _('Edits') }}</dt>
+          <dd>{{ user.number_of_edits }}</dd>
+        </dl>
+      </div>
+      <div class="info">
+        <dl>
+          {% if user.name.startswith('http://') or user.name.startswith('https://') %}
+            <dt>{{ _('Open ID') }}</dt>
+            <dd>{{ user.name|urlize(25) }}{# Be great if this just showed the domain #}</dd>
+          {% else %}
+            <dt>{{ _('Username') }}</dt>
+            <dd>{{ user.name }}</dd>
+          {% endif %}
+        </dl>
+        {% if c.is_myself %}
+        <dl>
+          <dt>{{ _('Email') }} <span class="label" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
+          <dd>{{ user.email }}</dd>
+        </dl>
+        {% endif %}
+        <dl>
+          <dt>{{ _('Member Since') }}</dt>
+          <dd>{{ h.render_datetime(user.created) }}</dd>
+        </dl>
+        {% if c.is_myself %}
+        <dl>
+          <dt class="key">{{ _('API Key') }} <span class="label" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
+          <dd class="value"><code>{{ user.apikey }}</code></dd>
+        </dl>
+        {% endif %}
+      </div>
+    {% endblock %}
+  </section>
+</div>
+{% endblock %}