diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json
index 3f68d65311..55e1c76767 100644
--- a/platform/commonUI/inspect/bundle.json
+++ b/platform/commonUI/inspect/bundle.json
@@ -17,6 +17,16 @@
                 "key": "infobubble"
             }
         ],
+        "templates": [
+            {
+                "key": "info-table",
+                "templateUrl": "info-table.html"
+            },
+            {
+                "key": "info-bubble",
+                "templateUrl": "info-bubble.html"
+            }
+        ],
         "containers": [
             {
                 "key": "bubble",
diff --git a/platform/commonUI/inspect/res/info-bubble.html b/platform/commonUI/inspect/res/info-bubble.html
new file mode 100644
index 0000000000..1deeeade15
--- /dev/null
+++ b/platform/commonUI/inspect/res/info-bubble.html
@@ -0,0 +1,7 @@
+<mct-container key="bubble"
+               bubble-title="{{parameters.title}}"
+               bubble-layout="{{parameters.layout}}">
+    <mct-include key="info-table"
+                 ng-model="ngModel">
+    </mct-include>
+</mct-container>
diff --git a/platform/commonUI/inspect/res/table.html b/platform/commonUI/inspect/res/info-table.html
similarity index 78%
rename from platform/commonUI/inspect/res/table.html
rename to platform/commonUI/inspect/res/info-table.html
index d498b41c85..ef737dd130 100644
--- a/platform/commonUI/inspect/res/table.html
+++ b/platform/commonUI/inspect/res/info-table.html
@@ -1,5 +1,5 @@
 <table>
-    <tr ng-repeat="property in parameters">
+    <tr ng-repeat="property in ngModel">
         <td class="label">{{property.name}}</td>
         <td title="{{property.value}}" class="value align-{{property.align}}">
             {{property.value}}