diff --git a/app/views/tpi/ascor/_assessment.html.erb b/app/views/tpi/ascor/_assessment.html.erb
index 1db2dd630..d0149efaa 100644
--- a/app/views/tpi/ascor/_assessment.html.erb
+++ b/app/views/tpi/ascor/_assessment.html.erb
@@ -21,46 +21,10 @@
         </div>
 
         <div class="country-assessment__indicators" for="<%= dom_id(area) %>">
-          <% ascor_sub_indicators_for(area, indicators).each do |indicator| %>
-            <div class="country-assessment__indicator-block">
-              <div class="country-assessment__indicator">
-                <div class="country-assessment__indicator__title country-assessment__icon country-assessment__icon--<%= ascor_icon_for(indicator, @assessment) %>">
-                  <%= "#{indicator.code.split('.').last}. #{indicator.text}" %>
-                </div>
-                <% if ascor_assessment_result_for(indicator, @assessment).source.present? %>
-                  <div class="country-assessment__indicator__source">
-                    <%= link_to 'Source', ascor_assessment_result_for(indicator, @assessment).source %>
-                  </div>
-                <% end %>
-              </div>
-
-              <% ascor_sub_indicators_for(indicator, metrics).each do |metric| %>
-                <% next if metric.code == 'EP.1.a.ii'  # skipped because EP.1.a.i and EP.1.a.ii are rendered via same React component %>
-
-                <div class="country-assessment__metric-block">
-                  <% if metric.code == 'EP.1.a.i' %>
-                    <%= render 'tpi/ascor/metrics_ep1a', recent_emissions: @recent_emissions %>
-                  <% else %>
-                    <div class="country-assessment__metric">
-                      <div class="country-assessment__metric__title">
-                        <%= "#{metric.code.split('.').last}. #{metric.text}" %>
-                      </div>
-                      <% if ascor_assessment_result_for(metric, @assessment).source.present? %>
-                        <div class="country-assessment__metric__source">
-                          <%= link_to "Source (#{ascor_assessment_result_for(metric, @assessment).year})", ascor_assessment_result_for(metric, @assessment).source %>
-                        </div>
-                      <% end %>
-                      <% if ascor_assessment_result_for(metric, @assessment).answer.present? %>
-                        <div class="country-assessment__break"></div>
-                        <div class="country-assessment__metric__text">
-                          <%= ascor_assessment_result_for(metric, @assessment).answer %>
-                        </div>
-                      <% end %>
-                    </div>
-                  <% end %>
-                </div>
-              <% end %>
-            </div>
+          <% if ascor_sub_indicators_for(area, indicators).present? %>
+            <%= render 'tpi/ascor/assessment_indicators', area: area, indicators: ascor_sub_indicators_for(area, indicators), metrics: metrics %>
+          <% else %>
+            <%= render 'tpi/ascor/assessment_metrics', metrics: ascor_sub_indicators_for(area, metrics) %>
           <% end %>
         </div>
       </div>
diff --git a/app/views/tpi/ascor/_assessment_indicators.html.erb b/app/views/tpi/ascor/_assessment_indicators.html.erb
new file mode 100644
index 000000000..168357b82
--- /dev/null
+++ b/app/views/tpi/ascor/_assessment_indicators.html.erb
@@ -0,0 +1,16 @@
+<% indicators.each do |indicator| %>
+  <div class="country-assessment__indicator-block">
+    <div class="country-assessment__indicator">
+      <div class="country-assessment__indicator__title country-assessment__icon country-assessment__icon--<%= ascor_icon_for(indicator, @assessment) %>">
+        <%= "#{indicator.code.split('.').last}. #{indicator.text}" %>
+      </div>
+      <% if ascor_assessment_result_for(indicator, @assessment).source.present? %>
+        <div class="country-assessment__indicator__source">
+          <%= link_to 'Source', ascor_assessment_result_for(indicator, @assessment).source %>
+        </div>
+      <% end %>
+    </div>
+
+    <%= render 'tpi/ascor/assessment_metrics', metrics: ascor_sub_indicators_for(indicator, metrics) %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/tpi/ascor/_assessment_metrics.html.erb b/app/views/tpi/ascor/_assessment_metrics.html.erb
new file mode 100644
index 000000000..17815a09a
--- /dev/null
+++ b/app/views/tpi/ascor/_assessment_metrics.html.erb
@@ -0,0 +1,26 @@
+<% metrics.each do |metric| %>
+  <% next if metric.code == 'EP.1.a.ii'  # skipped because EP.1.a.i and EP.1.a.ii are rendered via same React component %>
+
+  <div class="country-assessment__metric-block">
+    <% if metric.code == 'EP.1.a.i' %>
+      <%= render 'tpi/ascor/metrics_ep1a', recent_emissions: @recent_emissions %>
+    <% else %>
+      <div class="country-assessment__metric">
+        <div class="country-assessment__metric__title">
+          <%= "#{metric.code.split('.').last}. #{metric.text}" %>
+        </div>
+        <% if ascor_assessment_result_for(metric, @assessment).source.present? %>
+          <div class="country-assessment__metric__source">
+            <%= link_to "Source (#{ascor_assessment_result_for(metric, @assessment).year})", ascor_assessment_result_for(metric, @assessment).source %>
+          </div>
+        <% end %>
+        <% if ascor_assessment_result_for(metric, @assessment).answer.present? %>
+          <div class="country-assessment__break"></div>
+          <div class="country-assessment__metric__text">
+            <%= ascor_assessment_result_for(metric, @assessment).answer %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
\ No newline at end of file