diff --git a/ckanext/opendata_theme/base/helpers.py b/ckanext/opendata_theme/base/helpers.py
index 5d3f756e..e6b04dfc 100644
--- a/ckanext/opendata_theme/base/helpers.py
+++ b/ckanext/opendata_theme/base/helpers.py
@@ -7,7 +7,7 @@
 import ckan.model as model
 
 from ckan.plugins import toolkit
-from ckan.plugins.toolkit import config, c
+from ckan.plugins.toolkit import config, c, g
 from packaging.version import Version
 
 from ckanext.opendata_theme.base.compatibility_controller import BaseCompatibilityController
@@ -109,18 +109,21 @@ def new_datasets(num=3):
 
 def get_user_uuid():
     """Return the user platform_uuid for a given email, if there is a token for that email"""
-    from ckanext.opengov.auth.db import UserToken
-    if c.userobj:
-        user = c.userobj
-        try:
-            user_token = model.Session.query(UserToken).filter_by(user_name=user.email).first()
-            if user_token:
-                return user_token.platform_uuid
-        except Exception as e:
-            logger.debug("[opendata_theme] Error querying user token: {}".format(e))
-            return None
-        return c.userobj.id
-    return None
+    try:
+        user = c.userobj or g.userobj
+        if user:
+            try:
+                from ckanext.opengov.auth.db import UserToken
+                user_token = model.Session.query(UserToken).filter_by(user_name=user.email).first()
+                if user_token:
+                    return user_token.platform_uuid
+            except Exception as e:
+                logger.debug("[opendata_theme] Error querying user token in get_user_uuid: {}".format(e))
+            return user.id
+        return None
+    except Exception as e:
+        logger.debug("[opendata_theme] Error in get_user_uuid: {}".format(e))
+        return None
 
 
 def package_tracking_summary(package):
diff --git a/ckanext/opendata_theme/opengov_custom_css/assets/css/theme.css b/ckanext/opendata_theme/opengov_custom_css/assets/css/theme.css
index 4e58e443..7f1ecb47 100644
--- a/ckanext/opendata_theme/opengov_custom_css/assets/css/theme.css
+++ b/ckanext/opendata_theme/opengov_custom_css/assets/css/theme.css
@@ -342,7 +342,7 @@ form.form-inline.form-select.lang-select {
 }
 .label[data-format=gml],
 .label[data-format*=gml] {
-  background-color: #847e31 !important;
+  background-color: #7B772D !important;
 }
 .label[data-format=kml],
 .label[data-format*=kml] {
diff --git a/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html b/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html
index 4de59630..a3a2e381 100644
--- a/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html
+++ b/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html
@@ -37,7 +37,7 @@
 
     <div class="collapse navbar-collapse" id="main-navigation-toggle">
       {% block header_site_navigation %}
-        <nav class="section navigation">
+        <nav class="section navigation" aria-label="{{ _('Navigation') }}">
           <ul class="nav nav-pills">
             {% block header_site_navigation_tabs %}
               {{ h.opendata_theme_build_nav_main(
diff --git a/ckanext/opendata_theme/opengov_custom_header/templates/default_header.html b/ckanext/opendata_theme/opengov_custom_header/templates/default_header.html
index 2234143e..73388500 100644
--- a/ckanext/opendata_theme/opengov_custom_header/templates/default_header.html
+++ b/ckanext/opendata_theme/opengov_custom_header/templates/default_header.html
@@ -44,7 +44,7 @@
     </div>
     <div class="collapse navbar-collapse" id="main-navigation-toggle">
       {% block header_site_navigation %}
-      <nav class="section navigation">
+      <nav class="section navigation" aria-label="{{ _('Navigation') }}">
         <ul class="nav nav-pills">
             {% block header_site_navigation_tabs %}
               {{ h.opendata_theme_build_nav_main(
diff --git a/ckanext/opendata_theme/opengov_custom_header/templates/page.html b/ckanext/opendata_theme/opengov_custom_header/templates/page.html
index 1c4efdcc..8ef13af3 100644
--- a/ckanext/opendata_theme/opengov_custom_header/templates/page.html
+++ b/ckanext/opendata_theme/opengov_custom_header/templates/page.html
@@ -9,7 +9,7 @@
 
   {% if header_layout_type=='sidebar' %}
     <input type="checkbox" id="hb__trigger" class="hb__trigger" aria-hidden="true">
-    <div class="main-navigation">
+    <nav class="main-navigation" aria-label="{{ _('Navigation') }}">
       <div class="main-navigation-title">
         {{ _('Menu') }}
       </div>
@@ -20,7 +20,7 @@
         {% endblock %}
         </ul>
       </div>
-    </div>
+    </nav>
   {% endif %}
 
   <div class="page" id="page">
diff --git a/ckanext/opendata_theme/opengov_custom_header/templates/sidebar_header.html b/ckanext/opendata_theme/opengov_custom_header/templates/sidebar_header.html
index c032b34b..d81a22fa 100644
--- a/ckanext/opendata_theme/opengov_custom_header/templates/sidebar_header.html
+++ b/ckanext/opendata_theme/opengov_custom_header/templates/sidebar_header.html
@@ -24,7 +24,7 @@
   {% endblock %}
   <div class="container">
     <div class="{{ g.header_class }} navbar-left">
-      <label tabindex="0" for="hb__trigger" class="nav-trigger" type="button" aria-label="Menu" aria-controls="navigation" aria-expanded="false">
+      <label tabindex="0" for="hb__trigger" class="nav-trigger" type="button" aria-label="Menu">
         <span class="sr-only">{{ _('Toggle Menu') }}</span>
         <div class="hb">
           <span class="hb__box">
diff --git a/ckanext/opendata_theme/opengov_custom_theme/templates/image_view.html b/ckanext/opendata_theme/opengov_custom_theme/templates/image_view.html
new file mode 100644
index 00000000..b0e8c5ff
--- /dev/null
+++ b/ckanext/opendata_theme/opengov_custom_theme/templates/image_view.html
@@ -0,0 +1,10 @@
+{% if resource_view.get('description') %}
+  {% set alt_text = resource_view.get('description') %}
+{% elif resource.get('name') and package.get('title') %}
+  {% set resource_name = resource.get('name') %}
+  {% set dataset_title = package.get('title') %}
+  {% set alt_text = 'Image for ' + resource_name + ' from the dataset ' + dataset_title %}
+{% else %}
+  {% set alt_text = '' %}
+{% endif %}
+<img style="margin:auto; max-height:100%; display:block" src="{{ resource_view.get('image_url') or resource.get('url') }}" alt="{{ alt_text }}" />
\ No newline at end of file
diff --git a/ckanext/opendata_theme/opengov_custom_theme/templates/package/resource_read.html b/ckanext/opendata_theme/opengov_custom_theme/templates/package/resource_read.html
index db6dfb61..2eaabeee 100644
--- a/ckanext/opendata_theme/opengov_custom_theme/templates/package/resource_read.html
+++ b/ckanext/opendata_theme/opengov_custom_theme/templates/package/resource_read.html
@@ -13,7 +13,25 @@
   <meta name="twitter:description" content="{{ description|forceescape|trim }}" />
 {% endblock -%}
 
-{% block resource_read_title %}<h1 class="page-heading">{{ h.resource_display_name(res) | truncate(100) }}</h1>{% endblock %}
+{% block resource_content %}
+  {% block package_archive_notice %}
+    {{ super() }}
+  {% endblock %}
+  {% block resource_read_title %}<h1 class="page-heading">{{ h.resource_display_name(res) | truncate(100) }}</h1>{% endblock %}
+  {% block resource_read_url %}
+    {{ super() }}
+  {% endblock %}
+  <div class="prose notes" property="rdfs:label">
+    {% if res.description %}
+      {{ h.render_markdown(res.description) }}
+    {% endif %}
+    {% if not res.description and package.notes %}
+      <h2>{{ _('Dataset description:') }}</h2>
+      <blockquote>{{ h.markdown_extract(h.get_translated(package, 'notes')) }}</blockquote>
+      <p>{% trans dataset=package.title, url=h.url_for(package.type ~ '.read', id=package.id if is_activity_archive else package.name) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+    {% endif %}
+  </div>
+{% endblock %}
 
 {% block download_resource_button %}
   {% if res.datastore_active %}
diff --git a/ckanext/opendata_theme/opengov_custom_theme/templates/snippets/home_breadcrumb_item.html b/ckanext/opendata_theme/opengov_custom_theme/templates/snippets/home_breadcrumb_item.html
new file mode 100644
index 00000000..fda4c40e
--- /dev/null
+++ b/ckanext/opendata_theme/opengov_custom_theme/templates/snippets/home_breadcrumb_item.html
@@ -0,0 +1,2 @@
+{# Used to insert the home icon into a breadcrumb #}
+<li class="home"><a href="{{ h.url_for('home.index') }}" aria-label="{{ _('Home') }}" title="{{ _('Home') }}"><i class="fa fa-home"></i><span> {{ _('Home') }}</span></a></li>
\ No newline at end of file