diff --git a/bayer/templates/modals/collections/new_pes_modal.html b/bayer/templates/modals/collections/new_pes_modal.html
index 1ebbdc34..2d1b75d9 100644
--- a/bayer/templates/modals/collections/new_pes_modal.html
+++ b/bayer/templates/modals/collections/new_pes_modal.html
@@ -36,8 +36,8 @@
       img.onerror = () => {
         this.pesVizHtml = `
           <div class='alert alert-error' role='alert'>
-            <h4 class='alert-heading'>Could not render PES!</h4>
-            <p>Could not render PES - Do you have access?</p>
+            <h4 class='alert-heading'>Failed to fetch this PES!</h4>
+            <p>Either the PES-ID is incorrect, or you're missing sufficient permissions to access this (potentially secret) item. In case you're missing permissions you can request the entitlement cs.u.enviPath_secret_data_user_group on go/idnow to gain access.</p>
           </div>`;
       };
     },
diff --git a/templates/index/index.html b/templates/index/index.html
index cd651032..7e033567 100644
--- a/templates/index/index.html
+++ b/templates/index/index.html
@@ -185,19 +185,18 @@
                   <div
                     class="mt-4 rounded-lg border border-base-300 bg-base-50 px-4 py-2.5 text-sm text-base-content/70"
                   >
-                    Prediction will be stored in
+                    Prediction will be stored in Package
                     <strong class="text-base-content"
-                      >{{ meta.current_package.name|safe }}</strong
+                    ><a class="link" href="{{ meta.current_package.url }}">{{ meta.current_package.name|safe }}</a></strong
                     >
                     {% if meta.user.default_setting %}
                       using setting
                       <strong class="text-base-content"
-                        >{{ meta.user.default_setting.name|safe }}</strong
+                      ><a class="link" href="{{ meta.user.default_setting.url}}">{{ meta.user.default_setting.name|safe }}</a></strong
                       >
                     {% endif %}
-                    <br />
                     To use a different setting click
-                    <a class="label link" href="/predict">here</a>
+                    <a class="link" href="/predict">here</a>
                   </div>
                 {% endif %}
               </div>
@@ -222,23 +221,22 @@
                 >
                   Predict!
                 </button>
-                {% if meta.current_package %}
+                  {% if meta.current_package %}
                   <div
                     class="mt-4 rounded-lg border border-base-300 bg-base-50 px-4 py-2.5 text-sm text-base-content/70"
                   >
-                    Prediction will be stored in
+                    Prediction will be stored in Package
                     <strong class="text-base-content"
-                      >{{ meta.current_package.name|safe }}</strong
+                    ><a class="link" href="{{ meta.current_package.url }}">{{ meta.current_package.name|safe }}</a></strong
                     >
                     {% if meta.user.default_setting %}
                       using setting
                       <strong class="text-base-content"
-                        >{{ meta.user.default_setting.name|safe }}</strong
+                      ><a class="link" href="{{ meta.user.default_setting.url}}">{{ meta.user.default_setting.name|safe }}</a></strong
                       >
                     {% endif %}
-                    <br />
                     To use a different setting click
-                    <a class="label link" href="/predict">here</a>
+                    <a class="link" href="/predict">here</a>
                   </div>
                 {% endif %}
               </div>
diff --git a/templates/modals/objects/edit_user_modal.html b/templates/modals/objects/edit_user_modal.html
index 03ce0f2a..8457cba9 100644
--- a/templates/modals/objects/edit_user_modal.html
+++ b/templates/modals/objects/edit_user_modal.html
@@ -31,6 +31,7 @@
         {% csrf_token %}
 
         <div class="form-control mb-3">
+          {% if 1 == 0 %}
           <label class="label" for="default-package">
             <span class="label-text">Default Package</span>
           </label>
@@ -50,7 +51,7 @@
             {% endfor %}
           </select>
         </div>
-
+        {% endif %}
         <div class="form-control mb-3">
           <label class="label" for="default-group">
             <span class="label-text">Default Group</span>
diff --git a/templates/predict_pathway.html b/templates/predict_pathway.html
index cdfc62d3..9fc6987a 100644
--- a/templates/predict_pathway.html
+++ b/templates/predict_pathway.html
@@ -2,11 +2,23 @@
 {% load static %}
 {% block content %}
   <div class="mx-auto w-full p-8">
-    <h1 class="h1 mb-4 text-3xl font-bold">
+    <h1 class="h1 mb-4 flex items-center gap-2 text-3xl font-bold">
       Predict a Pathway
 
-      <span class="text-base-content/50 text-xs"
-        >in <strong>{{ meta.current_package.name|safe }}</strong>
+      <span class="inline-flex items-center gap-1 text-base-content/50 text-xs"
+        >in <strong>{{ meta.current_package.name|safe }}</strong>{% if meta.url_contains_package %}
+      {% if meta.current_package.get_classification_level_display == "Restricted" %}
+        <img src="{% static 'images/restricted_mid.png' %}" width="100">
+      {% elif meta.current_package.get_classification_level_display == "Secret" %}
+        <img src="{% static 'images/secret_mid.png' %}" width="60">
+      {% endif %}
+    {% else %}
+      {% if meta.user.default_package.get_classification_level_display == "Restricted" %}
+        <img src="{% static 'images/restricted_mid.png' %}" width="100">
+      {% elif meta.user.default_package.get_classification_level_display == "Secret" %}
+        <img src="{% static 'images/secret_mid.png' %}" width="60">
+      {% endif %}
+    {% endif %}
       </span>
     </h1>