diff --git a/frontend/src/components/InstanceView.jsx b/frontend/src/components/InstanceView.jsx
index a6dcba0..7a55c98 100644
--- a/frontend/src/components/InstanceView.jsx
+++ b/frontend/src/components/InstanceView.jsx
@@ -54,7 +54,7 @@ export const InstanceView = ({ templateName, objectID, endpoint }) => {
     return (
         <div
             ref={contentRef}
-            className="html-content bg-white shadow-lg dark:shadow-white text-gray-700 mx-auto md:my-8 p-8 md:w-[210mm] max-w-full overflow-auto print:shadow-none print:m-0 print:p-0 print:bg-transparent"
+            className="html-content bg-white shadow-lg dark:shadow-white text-gray-700 mx-auto md:my-8 p-8 md:w-[210mm] max-w-full max-h-full overflow-auto print:shadow-none print:m-0 print:p-0 print:bg-transparent"
         >
             {details.map((item, idx) => {
                 if (item.type === "SVGDisplay") {
diff --git a/frontend/src/components/Spinner.jsx b/frontend/src/components/Spinner.jsx
index d600601..97b4de6 100644
--- a/frontend/src/components/Spinner.jsx
+++ b/frontend/src/components/Spinner.jsx
@@ -2,6 +2,6 @@ import React from 'react';
 
 export const Spinner = ({}) => (
     <div className='flex justify-center items-center'>
-        <div className='animate-spin-slow rounded-full h-12 w-12 border-t-4 border-b-4 border-sky-500	ease-linear'></div>
+        <div className='animate-spin-slow rounded-full h-12 w-12 border-t-4 border-b-4 border-sky-500 ease-linear'></div>
     </div>
 );
\ No newline at end of file
diff --git a/frontend/src/components/TemplateView.jsx b/frontend/src/components/TemplateView.jsx
index 17d04d8..63c206f 100644
--- a/frontend/src/components/TemplateView.jsx
+++ b/frontend/src/components/TemplateView.jsx
@@ -31,7 +31,7 @@ export const TemplateView = ({endpoint}) => {
 
                 {/* Main Content */}
                 <main className="flex-1 overflow-hidden p-4">
-                    <div className="w-full p-4 max-w-none lg:max-w-4xl min-w-0 lg:min-w-[850px] overflow-y-auto h-full flex items-center justify-center"> {/* Ensure main content is scrollable and fills the height */}
+                    <div className="w-full p-4 max-w-none lg:max-w-4xl min-w-0 lg:min-w-[850px] overflow-y-hidden h-full flex items-center justify-center"> {/* Ensure main content is scrollable and fills the height */}
                         { !!!objectID && <p className='text-xl text-gray-700'>Select an Instance</p>}
                         { objectID && <InstanceView endpoint={endpoint} objectID={objectID} templateName={templateName} /> }
                     </div>
diff --git a/templates/diagrams.html.j2 b/templates/diagrams.html.j2
index f4a9175..bd7a2e8 100644
--- a/templates/diagrams.html.j2
+++ b/templates/diagrams.html.j2
@@ -13,7 +13,9 @@
 {% if object.nodes %}
 <ul>
 {% for node in object.nodes %}
+{% if node.name %}
 <li><a href="#{{ node.uuid }}">{{ node.name }}</a></li>
+{% endif %}
 {% endfor %}
 </ul>
 {% else %}