diff --git a/docs/layouts/partials/activityAlertProperties.html b/docs/layouts/partials/activityAlertProperties.html
deleted file mode 100644
index d22850aea..000000000
--- a/docs/layouts/partials/activityAlertProperties.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-<table>
-  <tr>
-    <td>Category</td>
-    <td>{{ .category }}</td>
-  </tr>
-  {{ if eq .category "Administrative" }}
-    <tr>
-      <td>Operation Name</td>
-      <td>{{ .operationName }}</td>
-    </tr>
-    <tr>
-      <td>Status</td>
-      <td>
-        {{ if or (reflect.IsMap .status) (reflect.IsSlice .status) }}
-          {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ")  .status) "json" }}
-        {{ else }}
-          {{ .status }}
-        {{ end }}
-      </td>
-    </tr>
-  {{ else if eq .category "ResourceHealth" }}
-    <tr>
-      <td>Causes</td>
-      <td>
-        {{ if or (reflect.IsMap .causes) (reflect.IsSlice .causes) }}
-          {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ")  .causes) "json" }}
-        {{ else }}
-          {{ .causes }}
-        {{ end }}
-      </td>
-    </tr>
-    <tr>
-      <td>Health Status</td>
-        <td>
-        {{ if or (reflect.IsMap .currentHealthStatus) (reflect.IsSlice .currentHealthStatus) }}
-          {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ")  .currentHealthStatus) "json" }}
-        {{ else }}
-          {{ .currentHealthStatus }}
-        {{ end }}
-      </td>
-    </tr>
-  {{ else if eq .category "ServiceHealth" }}
-    <tr>
-      <td>Incident Type</td>
-      <td>{{ .incidentType }}</td>
-    </tr>
-  {{ end }}
-</table>
diff --git a/docs/layouts/partials/logAlertProperties.html b/docs/layouts/partials/logAlertProperties.html
deleted file mode 100644
index 3ea363a82..000000000
--- a/docs/layouts/partials/logAlertProperties.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-<div><table>
-  {{ if isset . "dimensions" }}
-    <tr>
-      <td>Dimensions</td>
-      <td>
-        {{ if or (reflect.IsMap .dimensions) (reflect.IsSlice .dimensions) }}
-          {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ") .dimensions) "json" }}
-        {{ else }}
-          {{ .dimensions }}
-        {{ end }}
-      </td>
-    </tr>
-  {{ end }}
-  <tr>
-    <td>Failing Periods</td>
-    <td>
-      {{ if or (reflect.IsMap .failingPeriods) (reflect.IsSlice .failingPeriods) }}
-        {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ")  .failingPeriods) "json" }}
-      {{ else }}
-        {{ .failingPeriods }}
-      {{ end }}
-    </td>
-  </tr>
-  <tr>
-    <td>Aggregation</td>
-    <td>{{ .timeAggregation }}</td>
-  </tr>
-  <tr>
-    <td>Operator</td>
-    <td>{{ .operator }}</td>
-  </tr>
-  <tr>
-    <td>Threshold</td>
-    <td>{{ .threshold }}</td>
-  </tr>
-  <tr>
-    <td>Window</td>
-    <td>{{ .windowSize }}</td>
-  </tr>
-  <tr>
-    <td>Frequency</td>
-    <td>{{ .evaluationFrequency }}</td>
-  </tr>
-  <tr>
-    <td>Severity</td>
-    <td>{{ .severity }}</td>
-  </tr>
-  <tr>
-    <td>Metric Measure Column</td>
-    <td>{{ .metricMeasureColumn }}</td>
-  </tr>
-  <tr>
-    <td>Resource ID Column</td>
-    <td>{{ .resouceIdColumn }}</td>
-  </tr>
-</table></div>
diff --git a/docs/layouts/partials/metricAlertProperties.html b/docs/layouts/partials/metricAlertProperties.html
deleted file mode 100644
index 61709d092..000000000
--- a/docs/layouts/partials/metricAlertProperties.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<div><table>
-  <tr>
-    <td>Operator</td>
-    <td>{{ .operator }}</td>
-  </tr>
-  <tr>
-    <td>Aggregation</td>
-    <td>{{ .timeAggregation }}</td>
-  </tr>
-  {{ if eq .criterionType "DynamicThresholdCriterion" }}
-    <tr>
-      <td>Alert Sensitivity</td>
-      <td>{{ .alertSensitivity }}</td>
-    </tr>
-    <tr>
-      <td>Failing Periods</td>
-      <td>
-        {{ if or (reflect.IsMap .failingPeriods) (reflect.IsSlice .failingPeriods) }}
-          {{  transform.Highlight (encoding.Jsonify (dict "indent" "  ") .failingPeriods) "json"  }}
-        {{ else }}
-          {{ .failingPeriods }}
-        {{ end }}
-      </td>
-    </tr>
-  {{ else }}
-    <tr>
-      <td>Threshold</td>
-      <td>{{  cast.ToString .threshold }}</td>
-    </tr>
-  {{ end }}
-  <tr>
-    <td>Window</td>
-    <td>{{ .windowSize }}</td>
-  </tr>
-  <tr>
-    <td>Frequency</td>
-    <td>{{ .evaluationFrequency }}</td>
-  </tr>
-  <tr>
-    <td>Severity</td>
-    <td>{{ .severity }}</td>
-  </tr>
-  {{ if isset . "dimensions" }}
-    <tr>
-      <td>Dimensions</td>
-      <td>
-      {{ if or (reflect.IsMap .dimensions) (reflect.IsSlice .dimensions) }}
-        {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ") .dimensions) "json" }}
-      {{ else }}
-        {{ .dimensions }}
-      {{ end }}
-    </td>
-    </tr>
-  {{ end }}
-  <tr>
-    <td>Criterion Type</td>
-    <td>{{ .criterionType }}</td>
-  </tr>
-</table></div>
diff --git a/docs/layouts/shortcodes/alertList.html b/docs/layouts/shortcodes/alertList.html
index daf844ea0..48a117f26 100644
--- a/docs/layouts/shortcodes/alertList.html
+++ b/docs/layouts/shortcodes/alertList.html
@@ -19,7 +19,7 @@
         <th>Description</th>
       </tr>
       <!-- Loop through alerts under category/type -->
-      {{ range sort .alerts }}
+      {{ range sort .alerts "name" "asc" }}
         {{ if or (eq .visible true) (eq $.Site.Params.ambaDevMode true) }}
           <tr>
             <td><a href="#{{ anchorize .name }}">{{ .name }}</a></td>
@@ -34,7 +34,7 @@
   <br>
 
   <!-- Create a detail entry for each alert under category/type -->
-  {{ range sort .alerts }}
+  {{ range sort .alerts "name" "asc" }}
     {{ if or (eq .visible true) (eq $.Site.Params.ambaDevMode true) }}
     <br><br>
       <div id="{{ anchorize .name }}">
@@ -42,21 +42,22 @@
         <h3>{{ .name }} - {{ .type }} Alert</h3>
         <div style="text-indent: 1%;"><i>{{ .description }}</i></div>
         <h4>Recommended Properties:</h4>
-        {{ if eq .type "Metric" }}
-          {{- partial "metricAlertProperties" .properties }}
-        {{ else if eq .type "Log" }}
-          {{- partial "logAlertProperties" .properties }}
-        {{ else if eq .type "ActivityLog" }}
-          {{- partial "activityAlertProperties" .properties }}
-        {{ end }}
-        {{ if .properties.query }}
-          <div>
-            <h4>Query:</h4>
-            <div>
-              {{ transform.Highlight .properties.query "plaintext" }}
-            </div>
-          </div>
-        {{ end }}
+        <table>
+          {{ range $key, $value := .properties }}
+            <tr>
+              <td>{{ $key }}</td>
+              <td>
+                {{ if or (reflect.IsMap $value) (reflect.IsSlice $value) }}
+                  {{ transform.Highlight (encoding.Jsonify (dict "indent" "  ")  $value) "json" }}
+                {{ else if eq $key "query" }}
+                  {{ transform.Highlight $value "plaintext" }}
+                {{ else }}
+                  {{ $value }}
+                {{ end }}
+              </td>
+            </tr>
+          {{ end }}
+        </table>
         <h4>References:</h4>
         <table>
           {{ range .references }}