diff --git a/app/templates/corpora/_analysis/concordance.html.j2 b/app/templates/corpora/_analysis/concordance.html.j2
index a26c1a9a..6740425a 100644
--- a/app/templates/corpora/_analysis/concordance.html.j2
+++ b/app/templates/corpora/_analysis/concordance.html.j2
@@ -7,7 +7,7 @@
 {% set description = 'Query your corpus with the CQP query language utilizing a KWIC view.' %}
 
 
-{% macro container_element(id_prefix) %}
+{% macro container_content(id_prefix) %}
 <div class="card">
   <div class="card-content">
     <div class="row">
@@ -187,4 +187,4 @@
     }
   });
 </script>
-{% endset %}
+{% endmacro %}
diff --git a/app/templates/corpora/_analysis/static_visualization.html.j2 b/app/templates/corpora/_analysis/static_visualization.html.j2
index c457cbf3..2abd34ec 100644
--- a/app/templates/corpora/_analysis/static_visualization.html.j2
+++ b/app/templates/corpora/_analysis/static_visualization.html.j2
@@ -1,12 +1,15 @@
+{# The extension icon #}
+{% set icon = '' %}
+
+{# The extension name #}
 {% set name = 'Static Visualization (beta)' %}
 
+{# The extension description #}
 {% set description = '' %}
 
-{% set id_prefix = name.lower().replace(' ', '-') + '-extension' %}
 
-{% set tab_content = '' %}
-
-{% set container_content %}
+{# The extension container content #}
+{% macro container_content(id_prefix) %}
 <div class="row">
     <div class="col s12">
       <h4><i class="material-icons left">query_stats</i>{{ name }}</h4>
@@ -119,9 +122,9 @@
 <div class="row">
 
 </div>
-{% endset %}
+{% endmacro %}
 
-{% set modals %}
+{% macro modals(id_prefix) %}
 <div class="modal modal-fixed-footer" id="frequencies-stopwords-setting-modal">
   <div class="modal-content">
     <h4>Settings</h4>
@@ -151,11 +154,11 @@
     <a class="modal-close waves-effect waves-green btn frequencies-stopword-setting-modal-action-buttons" data-action="cancel">Cancel</a>
     <a class="modal-close waves-effect waves-green btn frequencies-stopword-setting-modal-action-buttons" data-action="submit">Submit</a>
 </div>
-{% endset %}
+{% endmacro %}
 
-{% set scripts %}
+{% macro scripts(id_prefix) %}
 <script>
   const corpusAnalysisStaticVisualization = new CorpusAnalysisStaticVisualization(corpusAnalysisApp);
 </script>
-{% endset %}
+{% endmacro %}
  
\ No newline at end of file
diff --git a/app/templates/corpora/analysis.html.j2 b/app/templates/corpora/analysis.html.j2
index 4c43552a..31eee99d 100644
--- a/app/templates/corpora/analysis.html.j2
+++ b/app/templates/corpora/analysis.html.j2
@@ -21,7 +21,7 @@
   <li class="tab col s3"><a class="active" href="#corpus-analysis-app-home-container"><i class="nopaque-icons service-icons left" data-service="corpus-analysis"></i>Corpus analysis</a></li>
   {% for id, extension in extensions.items() if extension.name != 'Static Visualization (beta)' %}
   <li class="tab col s3">
-    <a href="#{{ id }}-container"><i class="material-icons left">extension.icon</i>{{ extension.name }}</a>
+    <a href="#{{ id }}-container"><i class="material-icons left">{{ extension.icon }}</i>{{ extension.name }}</a>
   </li>
   {% endfor %}
 </ul>
@@ -42,7 +42,7 @@
     {% endfor %}
   </div>
 
-  {{ static_visualization_extension.container_content }}
+  {{ static_visualization_extension.container_content('static-visualizations-extension') }}
 </div>