diff --git a/bayer/templates/objects/compound_structure_viz.html b/bayer/templates/objects/compound_structure_viz.html
index 44892470..90e34e1f 100644
--- a/bayer/templates/objects/compound_structure_viz.html
+++ b/bayer/templates/objects/compound_structure_viz.html
@@ -4,7 +4,7 @@
     <input type="checkbox" checked />
     <div class="collapse-title text-xl font-medium">Link to PES</div>
     <div class="collapse-content">
-      <a href="{{ compound.default_structure.pes_link }}" class="hover:bg-base-200">{{ compound.default_structure.pes_link }}</a>
+      <a href="{{ compound_structure.pes_link }}" class="hover:bg-base-200">{{ compound_structure.pes_link }}</a>
     </div>
   </div>
 
diff --git a/bayer/templates/objects/node_viz.html b/bayer/templates/objects/node_viz.html
index 4426726b..1bfa3109 100644
--- a/bayer/templates/objects/node_viz.html
+++ b/bayer/templates/objects/node_viz.html
@@ -3,7 +3,9 @@
   <div class="collapse-arrow bg-base-200 collapse">
     <input type="checkbox" checked />
     <div class="collapse-title text-xl font-medium">Link to PES</div>
-    <div class="collapse-content">{{ node.default_node_label.pes_link }}</div>
+    <div class="collapse-content">
+      <a href="{{ node.default_node_label.pes_link }}" class="hover:bg-base-200">{{ node.default_node_label.pes_link }}</a>
+    </div>
   </div>
 
   <!-- Image Representation -->