diff --git a/themes/arm-design-system-hugo-theme/layouts/partials/test-maintenance/test-maintenance.html b/themes/arm-design-system-hugo-theme/layouts/partials/test-maintenance/test-maintenance.html
index 0546cb7e5..a3144363c 100644
--- a/themes/arm-design-system-hugo-theme/layouts/partials/test-maintenance/test-maintenance.html
+++ b/themes/arm-design-system-hugo-theme/layouts/partials/test-maintenance/test-maintenance.html
@@ -23,7 +23,62 @@
*/}}
-
+
+{{ if eq true $.Page.Params.test_maintenance }}
+ {{ $path := .RelPermalink }}
+
+ {{/* Split the path by "/" and manually build the path array using slice */}}
+ {{ $splitPath := strings.Split $path "/" }}
+ {{ $pathArray := slice }}
+ {{ range $i, $v := $splitPath }}
+ {{ if and (ne $v "") (ne $i (sub (len $splitPath) 1)) }} {{/* Skip empty elements and the last empty element */}}
+ {{ $pathArray = $pathArray | append $v }}
+ {{ end }}
+ {{ end }}
+
+
+ {{ $base := .Site.Data.stats_current_test_info.sw_categories }}
+ {{ $desiredKey := ""}}
+
+ {{ if in $pathArray "learning-paths" }}
+ {{ $desiredKey = index $base (index $pathArray 1) (index $pathArray 2) }}
+ {{else}}
+ {{/* Multi-dir check for install guides */}}
+ {{ if eq (len $pathArray) 3 }}
+ {{ $desiredKey = index $base (index $pathArray 0) (index $pathArray 2) }}
+ {{else}}
+ {{ $desiredKey = index $base (index $pathArray 0) (index $pathArray 1) }}
+ {{end}}
+ {{end}}
+
+ {{ range (index $desiredKey "tests_and_status") }}
+ {{range $image, $pass_or_fail := .}}
+
+ {{ $image_filtered := replace $image ":" "_"}}
+ {{ $image_filtered := replace $image_filtered "/" "_"}}
+ {{ if eq "passed" $pass_or_fail }}
+
+ {{ else }}
+
+ {{ end }}
+
+ {{end}}
+
+ {{ end }}
+{{ end }}
+
+
+
+
+
+
+
+
+
+
+
+
+{{/* Getting it from the _index.md page itself, initial implementation only. Switched to Data file; can remove this now.
{{ if eq true $.Page.Params.test_maintenance }}
{{ range $idx, $el := $.Page.Params.test_images }}
{{ if $.Page.Params.test_link }}
@@ -44,3 +99,5 @@
{{ end }}
{{ end }}
{{ end }}
+
+*/}}
\ No newline at end of file
diff --git a/themes/arm-design-system-hugo-theme/layouts/shortcodes/tab.html b/themes/arm-design-system-hugo-theme/layouts/shortcodes/tab.html
index a73465e63..063c2a73d 100644
--- a/themes/arm-design-system-hugo-theme/layouts/shortcodes/tab.html
+++ b/themes/arm-design-system-hugo-theme/layouts/shortcodes/tab.html
@@ -6,7 +6,9 @@
{{ with $.Parent }}
{{- if ne $.Parent.Name "tabpane" -}}
-{{- errorf "tab must be used within a tabpane block" -}}
+ {{- if ne $.Parent.Name "tabpane-normal" -}}
+ {{- errorf "tab must be used within a tabpane block" -}}
+ {{- end -}}
{{- end -}}
{{- end -}}
diff --git a/themes/arm-design-system-hugo-theme/layouts/shortcodes/tabpane-normal.html b/themes/arm-design-system-hugo-theme/layouts/shortcodes/tabpane-normal.html
new file mode 100644
index 000000000..670831e3e
--- /dev/null
+++ b/themes/arm-design-system-hugo-theme/layouts/shortcodes/tabpane-normal.html
@@ -0,0 +1,35 @@
+{{/*
+Create code panes via horizontal tabs. Uses the 'prismjs-codeblock.html' partial to align formatting with normal code blocks.
+*/}}
+
+
+
+{{- .Inner -}}
+
+{{$titles := slice}}
+{{- range $index, $element := $.Scratch.Get "tabs" -}}
+ {{$titles = $titles | append (urlize $element.header)}}
+{{end}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/themes/arm-design-system-hugo-theme/layouts/stats/list.html b/themes/arm-design-system-hugo-theme/layouts/stats/list.html
index c9d4053e1..966a54fcd 100644
--- a/themes/arm-design-system-hugo-theme/layouts/stats/list.html
+++ b/themes/arm-design-system-hugo-theme/layouts/stats/list.html
@@ -251,7 +251,8 @@
{{ printf "%.1f%%" (mul
{{if eq $key "install-guides"}}
{{$level_one_dir = "/"}}
{{end}}
- {{$info.readable_title}}
+ {{/* {{$info.readable_title}} */}}
+ {{$info.readable_title}}
|