diff --git a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-1.yaml b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-1.yaml
index 731ad1a..b98b165 100644
--- a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-1.yaml
+++ b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-1.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.finops.enabled }}
 apiVersion: v1
 data:
-  width: "16"
+  width: "12"
 kind: ConfigMap
 metadata:
   name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-1
diff --git a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2-panel.yaml b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2-panel.yaml
index 941e427..57daa33 100644
--- a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2-panel.yaml
+++ b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2-panel.yaml
@@ -17,7 +17,7 @@ spec:
     namespace: {{ .Release.Namespace }}
   widgetsRefs:
   - apiVersion: templates.krateo.io/v1alpha1
-    name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-paragraph
+    name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
     namespace: {{ .Release.Namespace }}
     resource: widgets
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2.yaml b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2.yaml
index 16f77b9..04ad544 100644
--- a/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2.yaml
+++ b/chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.finops.enabled }}
 apiVersion: v1
 data:
-  width: "6"
+  width: "10"
 kind: ConfigMap
 metadata:
   name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2
diff --git a/chart/templates/widgets.composition-tabpane-finops-panel-row-3-column-2-panel-paragraph.yaml b/chart/templates/widgets.composition-tabpane-finops-panel-row-3-column-2-panel-paragraph.yaml
index 87cb228..92f5fe3 100644
--- a/chart/templates/widgets.composition-tabpane-finops-panel-row-3-column-2-panel-paragraph.yaml
+++ b/chart/templates/widgets.composition-tabpane-finops-panel-row-3-column-2-panel-paragraph.yaml
@@ -1,10 +1,22 @@
 {{- if .Values.finops.enabled }}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
+  namespace: {{ .Release.Namespace }}
+data:
+  pageSize: "10"
+  columns: "[{ \"key\": \"resourceid\", \"title\": \"Resource ID\"},{ \"key\": \"metricname\", \"title\": \"Metric Name\"},{\"key\": \"unit\", \"title\": \"Unit\"},{\"key\": \"optimizeFrom\", \"title\": \"Optimization Start (hh:mm) \"},{\"key\": \"optimizeTo\", \"title\": \"Optimization End (hh:mm)\"},{\"key\": \"resourceDelta\", \"title\": \"Optimize by (%)\"}]"    
+---
 apiVersion: templates.krateo.io/v1alpha1
 kind: Widget
 metadata:
-  name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-paragraph
+  name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
 spec:
-  type: paragraph
+  type: tabledata
+  propsRef:
+    name: composition-aso-sample-tabpane-finops-panel-row-3-column-2-panel-paragraph
+    namespace: azure-pricing-system
   api:
   - name: getComposition
     path: "/apis/{{ .Values.global.compositionApiVersion }}/namespaces/{{ .Release.Namespace }}/{{ .Values.global.compositionResource }}/{{ .Release.Name }}"
@@ -13,5 +25,6 @@ spec:
     - 'Accept: application/json'
   app:
     template:
-      text: ${ .getComposition.spec.optimization // "Optimization request pending..." }
+      data: >
+        ${ [.getComposition.spec.optimization | fromjson | .[] | { resourceid: (.resourceid | split("/") | .[-1]), metricname: .metricname, unit: .unit, optimizeFrom: .optimization.from, resourceDelta: .optimization.resourceDelta, optimizeTo: .optimization.to  }] }
 {{- end }}
\ No newline at end of file