diff --git a/public/locales/en-US.json b/public/locales/en-US.json
index 05700570b..1a3d8a3e3 100644
--- a/public/locales/en-US.json
+++ b/public/locales/en-US.json
@@ -12,6 +12,8 @@
     "cardHeading": "CPU usage",
     "cardHeading_cores": "CPU core usage",
     "cardHeading_sockets": "CPU socket usage",
+    "cardHeading_OpenShift Container Platform": "Fixed capacity",
+    "cardHeading_OpenShift-metrics": "Flexible subscriptions",
     "cardHeading_OpenShift-dedicated-metrics": "Flexible subscriptions",
     "cardHeading_RHEL": "CPU socket usage",
     "cardHeading_Satellite": "CPU socket usage",
@@ -83,7 +85,12 @@
     "header_measurementType": "Type",
     "header_inventoryId": "UUID",
     "header_sockets": "Subscribed sockets",
+    "header_sockets_OpenShift Container Platform": "Sockets",
+    "header_sockets_OpenShift-metrics": "Sockets",
+    "header_sockets_OpenShift-dedicated-metrics": "Sockets",
     "header_lastSeen": "Last seen",
+    "header_lastSeen_OpenShift Container Platform": "Last check-in",
+    "header_lastSeen_OpenShift-metrics": "Last check-in",
     "header_lastSeen_OpenShift-dedicated-metrics": "Last check-in",
     "header_productName": "Product",
     "header_serviceLevel": "Service level",
@@ -152,8 +159,8 @@
   "curiosity-view": {
     "title": "{{appName}}",
     "subtitle": "Monitor your usage based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
-    "title_OpenShift Container Platform": "Red Hat OpenShift",
-    "subtitle_OpenShift Container Platform": "Monitor your Red Hat OpenShift usage by socket or core usage, based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
+    "title_OpenShift Container Platform": "OpenShift Container Platform",
+    "subtitle_OpenShift Container Platform": "Monitor your OpenShift Container Platform usage for both fixed and flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
     "title_OpenShift-dedicated-metrics": "OpenShift Dedicated",
     "subtitle_OpenShift-dedicated-metrics": "Monitor your OpenShift Dedicated usage for flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
     "title_RHEL": "Red Hat Enterprise Linux",
diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
index 73888da4b..5a25d4d65 100644
--- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
+++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -149,13 +149,9 @@ Array [
   Object {
     "file": "./src/components/openshiftView/openshiftView.js",
     "keys": Array [
-      Object {
-        "key": "curiosity-view.title",
-        "match": "t(\`curiosity-view.title\`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })",
-      },
       Object {
         "key": "curiosity-graph.cardHeading",
-        "match": "t('curiosity-graph.cardHeading', { context: uomFilter })",
+        "match": "t('curiosity-graph.cardHeading', { context: productId })",
       },
       Object {
         "key": "curiosity-inventory.tab",
@@ -165,6 +161,10 @@ Array [
         "key": "curiosity-inventory.tab",
         "match": "t('curiosity-inventory.tab', { context: 'subscriptions' })",
       },
+      Object {
+        "key": "curiosity-view.title",
+        "match": "t(\`curiosity-view.title\`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })",
+      },
       Object {
         "key": "curiosity-inventory.header",
         "match": "translate('curiosity-inventory.header', { context: 'guestsDisplayName' })",
@@ -174,12 +174,16 @@ Array [
         "match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
       },
       Object {
-        "key": "curiosity-inventory.measurementType",
-        "match": "translate('curiosity-inventory.measurementType', { context: measurementType.value })",
+        "key": "curiosity-inventory.header",
+        "match": "translate('curiosity-inventory.header', { context: 'sockets_OpenShift Container Platform' })",
       },
       Object {
-        "key": "curiosity-inventory.cloudProvider",
-        "match": "translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })",
+        "key": "curiosity-inventory.header",
+        "match": "translate('curiosity-inventory.header', { context: 'cores_OpenShift Container Platform' })",
+      },
+      Object {
+        "key": "curiosity-inventory.label",
+        "match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
       },
     ],
   },
@@ -559,6 +563,10 @@ Array [
     "file": "./src/components/openshiftView/openshiftView.js",
     "key": "curiosity-inventory.label",
   },
+  Object {
+    "file": "./src/components/openshiftView/openshiftView.js",
+    "key": "curiosity-inventory.label",
+  },
   Object {
     "file": "./src/components/productView/productView.js",
     "key": "curiosity-inventory.tab",
diff --git a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
index 95ed35ab0..8770eb37f 100644
--- a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
+++ b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
@@ -4,279 +4,446 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
 <PageLayout>
   <PageHeader
     includeTour={true}
-    productLabel="test label"
+    productLabel="OpenShift Container Platform"
     t={[Function]}
   >
-    t(curiosity-view.title, {"appName":"Subscription Watch","context":"test label"})
+    t(curiosity-view.title, {"appName":"Subscription Watch","context":"OpenShift Container Platform"})
   </PageHeader>
-  <PageMessages
+  <PageColumns
     className=""
   >
-    <Connect(BannerMessages)
-      productId="lorem ipsum"
-      query={
-        Object {
-          "uom": "cores",
-        }
-      }
-      viewId="viewOpenShift"
-    />
-  </PageMessages>
-  <PageToolbar
-    className=""
-  >
-    <Connect(Toolbar)
-      filterOptions={
-        Array [
-          Object {
-            "id": "sla",
-          },
-        ]
-      }
-      productId="lorem ipsum"
-      query={
-        Object {
-          "uom": "cores",
-        }
-      }
-      viewId="viewOpenShift"
-    />
-  </PageToolbar>
-  <PageSection
-    className=""
-  >
-    <Connect(GraphCard)
-      cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"cores\\"})"
-      filterGraphData={
-        Array [
-          Object {
-            "color": "#06c",
-            "fill": "#8bc1f7",
-            "id": "cores",
-            "isOptional": true,
-            "stroke": "#06c",
-          },
-          Object {
-            "id": "thresholdCores",
-            "isOptional": true,
-          },
-        ]
-      }
-      key="graph_lorem ipsum"
-      productId="lorem ipsum"
-      productLabel="test label"
-      query={
-        Object {
-          "beginning": "2019-06-20T00:00:00.000Z",
-          "ending": "2019-07-20T23:59:59.999Z",
-          "granularity": "daily",
-        }
-      }
-      viewId="viewOpenShift"
+    <PageToolbar
+      className=""
     >
-      <ToolbarFieldUom
-        options={
+      <Connect(Toolbar)
+        filterOptions={
           Array [
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"cores\\"})",
-              "value": "cores",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"sockets\\"})",
-              "value": "sockets",
+              "id": "sla",
             },
           ]
         }
-        t={[Function]}
-        value="cores"
+        productId="OpenShift Container Platform"
+        query={
+          Object {
+            "uom": "cores",
+          }
+        }
         viewId="viewOpenShift"
       />
-      <ToolbarFieldGranularity
-        options={
+    </PageToolbar>
+    <PageSection
+      className=""
+    >
+      <Connect(GraphCard)
+        cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"OpenShift Container Platform\\"})"
+        filterGraphData={
           Array [
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"daily\\"})",
-              "value": "daily",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"weekly\\"})",
-              "value": "weekly",
+              "color": "#06c",
+              "fill": "#8bc1f7",
+              "id": "cores",
+              "isOptional": true,
+              "stroke": "#06c",
             },
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"monthly\\"})",
-              "value": "monthly",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"quarterly\\"})",
-              "value": "quarterly",
+              "id": "thresholdCores",
+              "isOptional": true,
             },
           ]
         }
-        t={[Function]}
-        value="daily"
+        key="graph_OpenShift Container Platform"
+        productId="OpenShift Container Platform"
+        productLabel="OpenShift"
+        query={
+          Object {
+            "beginning": "2019-06-20T00:00:00.000Z",
+            "ending": "2019-07-20T23:59:59.999Z",
+            "granularity": "daily",
+          }
+        }
         viewId="viewOpenShift"
-      />
-    </Connect(GraphCard)>
-  </PageSection>
-  <PageSection
-    className=""
-  >
-    <Connect(InventoryTabs)
-      key="inventory_lorem ipsum"
-      productId="lorem ipsum"
-    >
-      <InventoryTab
-        active={false}
-        key="inventory_hosts_lorem ipsum"
-        title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
       >
-        <Connect(InventoryList)
-          filterGuestsData={
+        <ToolbarFieldUom
+          options={
             Array [
               Object {
-                "cell": [Function],
-                "header": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
-                "id": "displayName",
-              },
-              Object {
-                "cellWidth": 40,
-                "id": "inventoryId",
+                "selected": false,
+                "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"cores\\"})",
+                "value": "cores",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "lastSeen",
+                "selected": false,
+                "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"sockets\\"})",
+                "value": "sockets",
               },
             ]
           }
-          filterInventoryData={
+          t={[Function]}
+          value="cores"
+          viewId="viewOpenShift"
+        />
+        <ToolbarFieldGranularity
+          options={
             Array [
               Object {
-                "cell": [Function],
-                "id": "displayName",
-                "isSortable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"daily\\"})",
+                "value": "daily",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 20,
-                "id": "measurementType",
-                "isSortable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"weekly\\"})",
+                "value": "weekly",
               },
               Object {
-                "cellWidth": 15,
-                "id": "cores",
-                "isOptional": true,
-                "isSortable": true,
-                "isWrappable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"monthly\\"})",
+                "value": "monthly",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "lastSeen",
-                "isSortable": true,
-                "isWrappable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"quarterly\\"})",
+                "value": "quarterly",
               },
             ]
           }
-          key="lorem ipsum"
-          productId="lorem ipsum"
-          query={
-            Object {
-              "dir": "asc",
-              "limit": 100,
-              "offset": 0,
-              "sort": "last_seen",
-              "uom": "cores",
-            }
-          }
-          settings={Object {}}
+          t={[Function]}
+          value="daily"
           viewId="viewOpenShift"
         />
-      </InventoryTab>
-      <InventoryTab
-        active={false}
-        key="inventory_subs_lorem ipsum"
-        title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
+      </Connect(GraphCard)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(InventoryTabs)
+        key="inventory_OpenShift Container Platform"
+        productId="OpenShift Container Platform"
+      >
+        <InventoryTab
+          active={false}
+          key="inventory_hosts_OpenShift Container Platform"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
+        >
+          <Connect(InventoryList)
+            filterGuestsData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "header": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
+                  "id": "displayName",
+                },
+                Object {
+                  "cellWidth": 40,
+                  "id": "inventoryId",
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                },
+              ]
+            }
+            filterInventoryData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "id": "displayName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "header": "t(curiosity-inventory.header, {\\"context\\":\\"cores_OpenShift Container Platform\\"})",
+                  "id": "cores",
+                  "isOptional": true,
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="inv_OpenShift Container Platform"
+            productId="OpenShift Container Platform"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "last_seen",
+                "uom": "cores",
+              }
+            }
+            settings={Object {}}
+            viewId="viewOpenShift"
+          />
+        </InventoryTab>
+        <InventoryTab
+          active={false}
+          key="inventory_subs_OpenShift Container Platform"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
+        >
+          <Connect(InventorySubscriptions)
+            filterInventoryData={
+              Array [
+                Object {
+                  "id": "productName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "id": "serviceLevel",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "upcomingEventDate",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="subs_OpenShift Container Platform"
+            productId="OpenShift Container Platform"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "upcoming_event_date",
+                "uom": "cores",
+              }
+            }
+            viewId="viewOpenShift"
+          />
+        </InventoryTab>
+      </Connect(InventoryTabs)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(GraphCard)
+        cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"OpenShift-metrics\\"})"
+        filterGraphData={
+          Array [
+            Object {
+              "color": "#06c",
+              "fill": "#8bc1f7",
+              "id": "coreHours",
+              "stroke": "#06c",
+            },
+          ]
+        }
+        key="graph_OpenShift-metrics"
+        productId="OpenShift-metrics"
+        productLabel="OpenShift Metric"
+        query={
+          Object {
+            "beginning": "2019-06-20T00:00:00.000Z",
+            "ending": "2019-07-20T23:59:59.999Z",
+            "granularity": "daily",
+          }
+        }
+        viewId="viewOpenShiftMetric"
       >
-        <Connect(InventorySubscriptions)
-          filterInventoryData={
+        <ToolbarFieldRangedMonthly
+          options={
             Array [
               Object {
-                "id": "productName",
-                "isSortable": true,
+                "_title": "current",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"current\\"})",
+                "value": Object {
+                  "endDate": 2019-07-31T23:59:59.999Z,
+                  "startDate": 2019-07-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "june",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"June\\"})",
+                "value": Object {
+                  "endDate": 2019-06-30T23:59:59.999Z,
+                  "startDate": 2019-06-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "may",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"May\\"})",
+                "value": Object {
+                  "endDate": 2019-05-31T23:59:59.999Z,
+                  "startDate": 2019-05-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "april",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"April\\"})",
+                "value": Object {
+                  "endDate": 2019-04-30T23:59:59.999Z,
+                  "startDate": 2019-04-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "march",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"March\\"})",
+                "value": Object {
+                  "endDate": 2019-03-31T23:59:59.999Z,
+                  "startDate": 2019-03-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "february",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"February\\"})",
+                "value": Object {
+                  "endDate": 2019-02-28T23:59:59.999Z,
+                  "startDate": 2019-02-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "january",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"January\\"})",
+                "value": Object {
+                  "endDate": 2019-01-31T23:59:59.999Z,
+                  "startDate": 2019-01-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "december",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"December 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-12-31T23:59:59.999Z,
+                  "startDate": 2018-12-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "november",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"November 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-11-30T23:59:59.999Z,
+                  "startDate": 2018-11-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "october",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"October 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-10-31T23:59:59.999Z,
+                  "startDate": 2018-10-01T00:00:00.000Z,
+                },
               },
               Object {
-                "cellWidth": 15,
-                "id": "serviceLevel",
-                "isSortable": true,
-                "isWrappable": true,
+                "_title": "september",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"September 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-09-30T23:59:59.999Z,
+                  "startDate": 2018-09-01T00:00:00.000Z,
+                },
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "upcomingEventDate",
-                "isSortable": true,
-                "isWrappable": true,
+                "_title": "august",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"August 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-08-31T23:59:59.999Z,
+                  "startDate": 2018-08-01T00:00:00.000Z,
+                },
               },
             ]
           }
-          key="lorem ipsum"
-          productId="lorem ipsum"
-          query={
-            Object {
-              "dir": "asc",
-              "limit": 100,
-              "offset": 0,
-              "sort": "upcoming_event_date",
-              "uom": "cores",
-            }
-          }
-          viewId="viewOpenShift"
+          t={[Function]}
+          value="t(curiosity-toolbar.granularityRange, {\\"context\\":\\"current\\"})"
+          viewId="viewOpenShiftMetric"
         />
-      </InventoryTab>
-    </Connect(InventoryTabs)>
-  </PageSection>
+      </Connect(GraphCard)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(InventoryTabs)
+        key="inventory_OpenShift-metrics"
+        productId="OpenShift-metrics"
+      >
+        <InventoryTab
+          active={false}
+          key="inventory_hosts_OpenShift-metrics"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
+        >
+          <Connect(InventoryList)
+            filterGuestsData={Array []}
+            filterInventoryData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "id": "displayName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "id": "coreHours",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="inv_OpenShift-metrics"
+            productId="OpenShift-metrics"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "last_seen",
+              }
+            }
+            settings={Object {}}
+            viewId="viewOpenShiftMetric"
+          />
+        </InventoryTab>
+      </Connect(InventoryTabs)>
+    </PageSection>
+  </PageColumns>
 </PageLayout>
 `;
 
 exports[`OpenshiftView Component should have default props that set product configuration: filteredGuestsData results 1`] = `
 Object {
   "cells": Array [
-    Object {
-      "title": "lorem",
-    },
-    Object {
-      "title": "lorem inventory id",
-    },
-    Object {
-      "title": <DateFormat
-        date="lorem date obj"
-      />,
-    },
+    "lorem",
+    "lorem inventory id",
+    "lorem subscription id",
+    "lorem date obj",
+    "hello world",
   ],
   "columnHeaders": Array [
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
-      "transforms": Array [],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
+    "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"subscriptionManagerId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"loremIpsum\\"})",
   ],
   "data": Object {
     "displayName": Object {
@@ -306,43 +473,18 @@ Object {
 exports[`OpenshiftView Component should have default props that set product configuration: filteredGuestsData results, authorized 1`] = `
 Object {
   "cells": Array [
-    Object {
-      "title": <Button
-        component="a"
-        href="/insights/inventory/lorem inventory id/"
-        isInline={true}
-        target="_blank"
-        variant="link"
-      >
-        lorem
-      </Button>,
-    },
-    Object {
-      "title": "lorem inventory id",
-    },
-    Object {
-      "title": <DateFormat
-        date="lorem date obj"
-      />,
-    },
+    "lorem",
+    "lorem inventory id",
+    "lorem subscription id",
+    "lorem date obj",
+    "hello world",
   ],
   "columnHeaders": Array [
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
-      "transforms": Array [],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
+    "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"subscriptionManagerId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"loremIpsum\\"})",
   ],
   "data": Object {
     "displayName": Object {
@@ -372,61 +514,26 @@ Object {
 exports[`OpenshiftView Component should have default props that set product configuration: filteredInventoryData results 1`] = `
 Object {
   "cells": Array [
-    Object {
-      "title": <React.Fragment>
-        lorem
-         
-        t(curiosity-inventory.label, {"context":"numberOfGuests","count":3}, [object Object])
-      </React.Fragment>,
-    },
-    Object {
-      "title": <React.Fragment>
-        t(curiosity-inventory.measurementType, {"context":null})
-         
-        
-      </React.Fragment>,
-    },
-    Object {
-      "title": 10,
-    },
-    Object {
-      "title": 12,
-    },
-    Object {
-      "title": <DateFormat
-        date="lorem date obj"
-      />,
-    },
+    "lorem",
+    "lorem inventory id",
+    "ipsum",
+    null,
+    3,
+    10,
+    12,
+    "lorem date obj",
+    "hello world",
   ],
   "columnHeaders": Array [
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
-      "transforms": Array [],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"measurementType\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"sockets\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"cores\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
+    "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"hardwareType\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"measurementType\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"numberOfGuests\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"sockets\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"cores\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"loremIpsum\\"})",
   ],
   "data": Object {
     "cores": Object {
@@ -472,69 +579,26 @@ Object {
 exports[`OpenshiftView Component should have default props that set product configuration: filteredInventoryData results, authorized 1`] = `
 Object {
   "cells": Array [
-    Object {
-      "title": <React.Fragment>
-        <Button
-          component="a"
-          href="/insights/inventory/lorem inventory id/"
-          isInline={true}
-          target="_blank"
-          variant="link"
-        >
-          lorem
-        </Button>
-         
-        t(curiosity-inventory.label, {"context":"numberOfGuests","count":3}, [object Object])
-      </React.Fragment>,
-    },
-    Object {
-      "title": <React.Fragment>
-        t(curiosity-inventory.measurementType, {"context":null})
-         
-        
-      </React.Fragment>,
-    },
-    Object {
-      "title": 10,
-    },
-    Object {
-      "title": 12,
-    },
-    Object {
-      "title": <DateFormat
-        date="lorem date obj"
-      />,
-    },
+    "lorem",
+    "lorem inventory id",
+    "ipsum",
+    null,
+    3,
+    10,
+    12,
+    "lorem date obj",
+    "hello world",
   ],
   "columnHeaders": Array [
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
-      "transforms": Array [],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"measurementType\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"sockets\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"cores\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
-    Object {
-      "title": "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
-      "transforms": Array [
-        [Function],
-      ],
-    },
+    "t(curiosity-inventory.header, {\\"context\\":\\"displayName\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"inventoryId\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"hardwareType\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"measurementType\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"numberOfGuests\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"sockets\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"cores\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"lastSeen\\"})",
+    "t(curiosity-inventory.header, {\\"context\\":\\"loremIpsum\\"})",
   ],
   "data": Object {
     "cores": Object {
@@ -579,83 +643,10 @@ Object {
 
 exports[`OpenshiftView Component should have default props that set product configuration: initial configuration 1`] = `
 Object {
-  "initialGraphFilters": Array [
-    Object {
-      "color": "#06c",
-      "fill": "#8bc1f7",
-      "id": "cores",
-      "isOptional": true,
-      "stroke": "#06c",
-    },
-    Object {
-      "color": "#06c",
-      "fill": "#8bc1f7",
-      "id": "sockets",
-      "isOptional": true,
-      "stroke": "#06c",
-    },
-    Object {
-      "id": "thresholdSockets",
-      "isOptional": true,
-    },
-    Object {
-      "id": "thresholdCores",
-      "isOptional": true,
-    },
-  ],
-  "initialGuestsFilters": Array [
-    Object {
-      "cell": [Function],
-      "header": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
-      "id": "displayName",
-    },
-    Object {
-      "cellWidth": 40,
-      "id": "inventoryId",
-    },
-    Object {
-      "cell": [Function],
-      "cellWidth": 15,
-      "id": "lastSeen",
-    },
-  ],
-  "initialInventoryFilters": Array [
-    Object {
-      "cell": [Function],
-      "id": "displayName",
-      "isSortable": true,
-    },
-    Object {
-      "cell": [Function],
-      "cellWidth": 20,
-      "id": "measurementType",
-      "isSortable": true,
-    },
-    Object {
-      "cellWidth": 15,
-      "id": "sockets",
-      "isOptional": true,
-      "isSortable": true,
-      "isWrappable": true,
-    },
-    Object {
-      "cellWidth": 15,
-      "id": "cores",
-      "isOptional": true,
-      "isSortable": true,
-      "isWrappable": true,
-    },
-    Object {
-      "cell": [Function],
-      "cellWidth": 15,
-      "id": "lastSeen",
-      "isSortable": true,
-      "isWrappable": true,
-    },
-  ],
-  "query": Object {
-    "uom": "cores",
-  },
+  "initialGraphFilters": undefined,
+  "initialGuestsFilters": undefined,
+  "initialInventoryFilters": undefined,
+  "query": Object {},
 }
 `;
 
@@ -663,243 +654,427 @@ exports[`OpenshiftView Component should render a non-connected component: non-co
 <PageLayout>
   <PageHeader
     includeTour={true}
-    productLabel="test label"
+    productLabel="OpenShift Container Platform"
     t={[Function]}
   >
-    t(curiosity-view.title, {"appName":"Subscription Watch","context":"test label"})
+    t(curiosity-view.title, {"appName":"Subscription Watch","context":"OpenShift Container Platform"})
   </PageHeader>
-  <PageMessages
-    className=""
-  >
-    <Connect(BannerMessages)
-      productId="lorem ipsum"
-      query={
-        Object {
-          "uom": "cores",
-        }
-      }
-      viewId="viewOpenShift"
-    />
-  </PageMessages>
-  <PageToolbar
-    className=""
-  >
-    <Connect(Toolbar)
-      filterOptions={
-        Array [
-          Object {
-            "id": "sla",
-          },
-        ]
-      }
-      productId="lorem ipsum"
-      query={
-        Object {
-          "uom": "cores",
-        }
-      }
-      viewId="viewOpenShift"
-    />
-  </PageToolbar>
-  <PageSection
+  <PageColumns
     className=""
   >
-    <Connect(GraphCard)
-      cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"cores\\"})"
-      filterGraphData={
-        Array [
-          Object {
-            "color": "#06c",
-            "fill": "#8bc1f7",
-            "id": "cores",
-            "isOptional": true,
-            "stroke": "#06c",
-          },
-          Object {
-            "id": "thresholdCores",
-            "isOptional": true,
-          },
-        ]
-      }
-      key="graph_lorem ipsum"
-      productId="lorem ipsum"
-      productLabel="test label"
-      query={
-        Object {
-          "beginning": "2019-06-20T00:00:00.000Z",
-          "ending": "2019-07-20T23:59:59.999Z",
-          "granularity": "daily",
-        }
-      }
-      viewId="viewOpenShift"
+    <PageToolbar
+      className=""
     >
-      <ToolbarFieldUom
-        options={
+      <Connect(Toolbar)
+        filterOptions={
           Array [
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"cores\\"})",
-              "value": "cores",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"sockets\\"})",
-              "value": "sockets",
+              "id": "sla",
             },
           ]
         }
-        t={[Function]}
-        value="cores"
+        productId="OpenShift Container Platform"
+        query={
+          Object {
+            "uom": "cores",
+          }
+        }
         viewId="viewOpenShift"
       />
-      <ToolbarFieldGranularity
-        options={
+    </PageToolbar>
+    <PageSection
+      className=""
+    >
+      <Connect(GraphCard)
+        cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"OpenShift Container Platform\\"})"
+        filterGraphData={
           Array [
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"daily\\"})",
-              "value": "daily",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"weekly\\"})",
-              "value": "weekly",
+              "color": "#06c",
+              "fill": "#8bc1f7",
+              "id": "cores",
+              "isOptional": true,
+              "stroke": "#06c",
             },
             Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"monthly\\"})",
-              "value": "monthly",
-            },
-            Object {
-              "selected": false,
-              "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"quarterly\\"})",
-              "value": "quarterly",
+              "id": "thresholdCores",
+              "isOptional": true,
             },
           ]
         }
-        t={[Function]}
-        value="daily"
+        key="graph_OpenShift Container Platform"
+        productId="OpenShift Container Platform"
+        productLabel="OpenShift"
+        query={
+          Object {
+            "beginning": "2019-06-20T00:00:00.000Z",
+            "ending": "2019-07-20T23:59:59.999Z",
+            "granularity": "daily",
+          }
+        }
         viewId="viewOpenShift"
-      />
-    </Connect(GraphCard)>
-  </PageSection>
-  <PageSection
-    className=""
-  >
-    <Connect(InventoryTabs)
-      key="inventory_lorem ipsum"
-      productId="lorem ipsum"
-    >
-      <InventoryTab
-        active={false}
-        key="inventory_hosts_lorem ipsum"
-        title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
       >
-        <Connect(InventoryList)
-          filterGuestsData={
+        <ToolbarFieldUom
+          options={
             Array [
               Object {
-                "cell": [Function],
-                "header": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
-                "id": "displayName",
-              },
-              Object {
-                "cellWidth": 40,
-                "id": "inventoryId",
+                "selected": false,
+                "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"cores\\"})",
+                "value": "cores",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "lastSeen",
+                "selected": false,
+                "title": "t(curiosity-toolbar.uom, {\\"context\\":\\"sockets\\"})",
+                "value": "sockets",
               },
             ]
           }
-          filterInventoryData={
+          t={[Function]}
+          value="cores"
+          viewId="viewOpenShift"
+        />
+        <ToolbarFieldGranularity
+          options={
             Array [
               Object {
-                "cell": [Function],
-                "id": "displayName",
-                "isSortable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"daily\\"})",
+                "value": "daily",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 20,
-                "id": "measurementType",
-                "isSortable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"weekly\\"})",
+                "value": "weekly",
               },
               Object {
-                "cellWidth": 15,
-                "id": "cores",
-                "isOptional": true,
-                "isSortable": true,
-                "isWrappable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"monthly\\"})",
+                "value": "monthly",
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "lastSeen",
-                "isSortable": true,
-                "isWrappable": true,
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularity, {\\"context\\":\\"quarterly\\"})",
+                "value": "quarterly",
               },
             ]
           }
-          key="lorem ipsum"
-          productId="lorem ipsum"
-          query={
-            Object {
-              "dir": "asc",
-              "limit": 100,
-              "offset": 0,
-              "sort": "last_seen",
-              "uom": "cores",
-            }
-          }
-          settings={Object {}}
+          t={[Function]}
+          value="daily"
           viewId="viewOpenShift"
         />
-      </InventoryTab>
-      <InventoryTab
-        active={false}
-        key="inventory_subs_lorem ipsum"
-        title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
+      </Connect(GraphCard)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(InventoryTabs)
+        key="inventory_OpenShift Container Platform"
+        productId="OpenShift Container Platform"
+      >
+        <InventoryTab
+          active={false}
+          key="inventory_hosts_OpenShift Container Platform"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
+        >
+          <Connect(InventoryList)
+            filterGuestsData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "header": "t(curiosity-inventory.header, {\\"context\\":\\"guestsDisplayName\\"})",
+                  "id": "displayName",
+                },
+                Object {
+                  "cellWidth": 40,
+                  "id": "inventoryId",
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                },
+              ]
+            }
+            filterInventoryData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "id": "displayName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "header": "t(curiosity-inventory.header, {\\"context\\":\\"cores_OpenShift Container Platform\\"})",
+                  "id": "cores",
+                  "isOptional": true,
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="inv_OpenShift Container Platform"
+            productId="OpenShift Container Platform"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "last_seen",
+                "uom": "cores",
+              }
+            }
+            settings={Object {}}
+            viewId="viewOpenShift"
+          />
+        </InventoryTab>
+        <InventoryTab
+          active={false}
+          key="inventory_subs_OpenShift Container Platform"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
+        >
+          <Connect(InventorySubscriptions)
+            filterInventoryData={
+              Array [
+                Object {
+                  "id": "productName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "id": "serviceLevel",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "upcomingEventDate",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="subs_OpenShift Container Platform"
+            productId="OpenShift Container Platform"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "upcoming_event_date",
+                "uom": "cores",
+              }
+            }
+            viewId="viewOpenShift"
+          />
+        </InventoryTab>
+      </Connect(InventoryTabs)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(GraphCard)
+        cardTitle="t(curiosity-graph.cardHeading, {\\"context\\":\\"OpenShift-metrics\\"})"
+        filterGraphData={
+          Array [
+            Object {
+              "color": "#06c",
+              "fill": "#8bc1f7",
+              "id": "coreHours",
+              "stroke": "#06c",
+            },
+          ]
+        }
+        key="graph_OpenShift-metrics"
+        productId="OpenShift-metrics"
+        productLabel="OpenShift Metric"
+        query={
+          Object {
+            "beginning": "2019-06-20T00:00:00.000Z",
+            "ending": "2019-07-20T23:59:59.999Z",
+            "granularity": "daily",
+          }
+        }
+        viewId="viewOpenShiftMetric"
       >
-        <Connect(InventorySubscriptions)
-          filterInventoryData={
+        <ToolbarFieldRangedMonthly
+          options={
             Array [
               Object {
-                "id": "productName",
-                "isSortable": true,
+                "_title": "current",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"current\\"})",
+                "value": Object {
+                  "endDate": 2019-07-31T23:59:59.999Z,
+                  "startDate": 2019-07-01T00:00:00.000Z,
+                },
               },
               Object {
-                "cellWidth": 15,
-                "id": "serviceLevel",
-                "isSortable": true,
-                "isWrappable": true,
+                "_title": "june",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"June\\"})",
+                "value": Object {
+                  "endDate": 2019-06-30T23:59:59.999Z,
+                  "startDate": 2019-06-01T00:00:00.000Z,
+                },
               },
               Object {
-                "cell": [Function],
-                "cellWidth": 15,
-                "id": "upcomingEventDate",
-                "isSortable": true,
-                "isWrappable": true,
+                "_title": "may",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"May\\"})",
+                "value": Object {
+                  "endDate": 2019-05-31T23:59:59.999Z,
+                  "startDate": 2019-05-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "april",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"April\\"})",
+                "value": Object {
+                  "endDate": 2019-04-30T23:59:59.999Z,
+                  "startDate": 2019-04-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "march",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"March\\"})",
+                "value": Object {
+                  "endDate": 2019-03-31T23:59:59.999Z,
+                  "startDate": 2019-03-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "february",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"February\\"})",
+                "value": Object {
+                  "endDate": 2019-02-28T23:59:59.999Z,
+                  "startDate": 2019-02-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "january",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"January\\"})",
+                "value": Object {
+                  "endDate": 2019-01-31T23:59:59.999Z,
+                  "startDate": 2019-01-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "december",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"December 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-12-31T23:59:59.999Z,
+                  "startDate": 2018-12-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "november",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"November 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-11-30T23:59:59.999Z,
+                  "startDate": 2018-11-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "october",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"October 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-10-31T23:59:59.999Z,
+                  "startDate": 2018-10-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "september",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"September 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-09-30T23:59:59.999Z,
+                  "startDate": 2018-09-01T00:00:00.000Z,
+                },
+              },
+              Object {
+                "_title": "august",
+                "selected": false,
+                "title": "t(curiosity-toolbar.granularityRange, {\\"context\\":\\"August 2018\\"})",
+                "value": Object {
+                  "endDate": 2018-08-31T23:59:59.999Z,
+                  "startDate": 2018-08-01T00:00:00.000Z,
+                },
               },
             ]
           }
-          key="lorem ipsum"
-          productId="lorem ipsum"
-          query={
-            Object {
-              "dir": "asc",
-              "limit": 100,
-              "offset": 0,
-              "sort": "upcoming_event_date",
-              "uom": "cores",
-            }
-          }
-          viewId="viewOpenShift"
+          t={[Function]}
+          value="t(curiosity-toolbar.granularityRange, {\\"context\\":\\"current\\"})"
+          viewId="viewOpenShiftMetric"
         />
-      </InventoryTab>
-    </Connect(InventoryTabs)>
-  </PageSection>
+      </Connect(GraphCard)>
+    </PageSection>
+    <PageSection
+      className=""
+    >
+      <Connect(InventoryTabs)
+        key="inventory_OpenShift-metrics"
+        productId="OpenShift-metrics"
+      >
+        <InventoryTab
+          active={false}
+          key="inventory_hosts_OpenShift-metrics"
+          title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
+        >
+          <Connect(InventoryList)
+            filterGuestsData={Array []}
+            filterInventoryData={
+              Array [
+                Object {
+                  "cell": [Function],
+                  "id": "displayName",
+                  "isSortable": true,
+                },
+                Object {
+                  "cellWidth": 15,
+                  "id": "coreHours",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+                Object {
+                  "cell": [Function],
+                  "cellWidth": 15,
+                  "id": "lastSeen",
+                  "isSortable": true,
+                  "isWrappable": true,
+                },
+              ]
+            }
+            key="inv_OpenShift-metrics"
+            productId="OpenShift-metrics"
+            query={
+              Object {
+                "dir": "asc",
+                "limit": 100,
+                "offset": 0,
+                "sort": "last_seen",
+              }
+            }
+            settings={Object {}}
+            viewId="viewOpenShiftMetric"
+          />
+        </InventoryTab>
+      </Connect(InventoryTabs)>
+    </PageSection>
+  </PageColumns>
 </PageLayout>
 `;
diff --git a/src/components/openshiftView/openshiftView.js b/src/components/openshiftView/openshiftView.js
index 28f5c1855..74c22ed42 100644
--- a/src/components/openshiftView/openshiftView.js
+++ b/src/components/openshiftView/openshiftView.js
@@ -7,8 +7,9 @@ import {
 import { Button, Label as PfLabel } from '@patternfly/react-core';
 import { DateFormat } from '@redhat-cloud-services/frontend-components/components/DateFormat';
 import moment from 'moment';
-import { PageLayout, PageHeader, PageMessages, PageSection, PageToolbar } from '../pageLayout/pageLayout';
+import { PageLayout, PageColumns, PageHeader, PageSection, PageToolbar } from '../pageLayout/pageLayout';
 import {
+  RHSM_API_PATH_ID_TYPES,
   RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
   RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES,
   RHSM_API_QUERY_TYPES,
@@ -20,11 +21,11 @@ import { apiQueries, connect, reduxSelectors } from '../../redux';
 import GraphCard from '../graphCard/graphCard';
 import { ToolbarFieldUom } from '../toolbar/toolbarFieldUom';
 import { ToolbarFieldGranularity } from '../toolbar/toolbarFieldGranularity';
+import { ToolbarFieldRangedMonthly } from '../toolbar/toolbarFieldRangedMonthly';
 import Toolbar from '../toolbar/toolbar';
 import InventoryList from '../inventoryList/inventoryList';
 import InventorySubscriptions from '../inventorySubscriptions/inventorySubscriptions';
 import InventoryTabs, { InventoryTab } from '../inventoryTabs/inventoryTabs';
-import BannerMessages from '../bannerMessages/bannerMessages';
 import { helpers, dateHelpers } from '../../common';
 import { translate } from '../i18n/i18n';
 
@@ -32,34 +33,35 @@ import { translate } from '../i18n/i18n';
  * An OpenShift encompassing view.
  *
  * @augments React.Component
- * @fires onSelect
  */
 class OpenshiftView extends React.Component {
   componentDidMount() {}
 
   /**
-   * Render an OpenShift view.
+   * Render a product column
    *
+   * @param {object} config
+   * @param {string} uomValue
    * @returns {Node}
    */
-  render() {
+  renderProduct(config, uomValue) {
+    const { t } = this.props;
     const {
-      initialGuestsFilters,
-      initialToolbarFilters,
-      initialInventorySettings,
-      initialGraphFilters,
-      initialInventoryFilters,
+      productContextFilterUom,
+      query = {},
+      graphTallyQuery = {},
+      inventoryHostsQuery = {},
+      inventorySubscriptionsQuery = {},
+      initialGraphFilters = [],
+      initialGuestsFilters = [],
+      initialInventoryFilters = [],
+      initialInventorySettings = {},
       initialSubscriptionsInventoryFilters,
-      initialOption,
-      query,
-      graphTallyQuery,
-      inventoryHostsQuery,
-      inventorySubscriptionsQuery,
-      routeDetail,
-      t,
+      initialToolbarFilters,
+      productLabel,
+      productId,
       viewId
-    } = this.props;
-    const { pathParameter: productId, productParameter: productLabel } = routeDetail;
+    } = config;
     const {
       graphTallyQuery: initialGraphTallyQuery,
       inventoryHostsQuery: initialInventoryHostsQuery,
@@ -67,29 +69,33 @@ class OpenshiftView extends React.Component {
       toolbarQuery
     } = apiQueries.parseRhsmQuery(query, { graphTallyQuery, inventoryHostsQuery, inventorySubscriptionsQuery });
 
-    const uomFilter = query[RHSM_API_QUERY_TYPES.UOM] || initialOption;
-    const filter = ({ id, isOptional }) => {
-      if (!isOptional) {
-        return true;
-      }
-      return new RegExp(uomFilter, 'i').test(id);
-    };
+    let graphFilters = initialGraphFilters;
+    let inventoryFilters = initialInventoryFilters;
+    let subscriptionsInventoryFilters = initialSubscriptionsInventoryFilters;
+    let uomFilter;
+
+    if (productContextFilterUom) {
+      uomFilter = uomValue || query[RHSM_API_QUERY_TYPES.UOM];
 
-    const graphFilters = initialGraphFilters.filter(filter);
-    const inventoryFilters = initialInventoryFilters.filter(filter);
-    const subscriptionsInventoryFilters = initialSubscriptionsInventoryFilters.filter(filter);
+      const filter = ({ id, isOptional }) => {
+        if (!isOptional) {
+          return true;
+        }
+        return new RegExp(uomFilter, 'i').test(id);
+      };
+
+      graphFilters = initialGraphFilters.filter(filter);
+      inventoryFilters = initialInventoryFilters.filter(filter);
+      subscriptionsInventoryFilters = initialSubscriptionsInventoryFilters.filter(filter);
+    }
 
     return (
-      <PageLayout>
-        <PageHeader productLabel={productLabel} includeTour>
-          {t(`curiosity-view.title`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })}
-        </PageHeader>
-        <PageMessages>
-          <BannerMessages productId={productId} viewId={viewId} query={query} />
-        </PageMessages>
-        <PageToolbar>
-          <Toolbar filterOptions={initialToolbarFilters} productId={productId} query={toolbarQuery} viewId={viewId} />
-        </PageToolbar>
+      <React.Fragment key={`product_${productId}_${uomFilter}`}>
+        {initialToolbarFilters && (
+          <PageToolbar>
+            <Toolbar filterOptions={initialToolbarFilters} productId={productId} query={toolbarQuery} viewId={viewId} />
+          </PageToolbar>
+        )}
         <PageSection>
           <GraphCard
             key={`graph_${productId}`}
@@ -97,11 +103,16 @@ class OpenshiftView extends React.Component {
             query={initialGraphTallyQuery}
             productId={productId}
             viewId={viewId}
-            cardTitle={t('curiosity-graph.cardHeading', { context: uomFilter })}
+            cardTitle={t('curiosity-graph.cardHeading', { context: productId })}
             productLabel={productLabel}
           >
-            <ToolbarFieldUom value={initialOption} viewId={viewId} />
-            <ToolbarFieldGranularity value={initialGraphTallyQuery[RHSM_API_QUERY_TYPES.GRANULARITY]} viewId={viewId} />
+            {productId === RHSM_API_PATH_ID_TYPES.OPENSHIFT && uomFilter && (
+              <ToolbarFieldUom value={uomFilter} viewId={viewId} />
+            )}
+            {productId === RHSM_API_PATH_ID_TYPES.OPENSHIFT && (
+              <ToolbarFieldGranularity value={graphTallyQuery[RHSM_API_QUERY_TYPES.GRANULARITY]} viewId={viewId} />
+            )}
+            {productId === RHSM_API_PATH_ID_TYPES.OPENSHIFT_METRICS && <ToolbarFieldRangedMonthly viewId={viewId} />}
           </GraphCard>
         </PageSection>
         <PageSection>
@@ -111,7 +122,7 @@ class OpenshiftView extends React.Component {
               title={t('curiosity-inventory.tab', { context: 'hosts' })}
             >
               <InventoryList
-                key={productId}
+                key={`inv_${productId}`}
                 filterGuestsData={initialGuestsFilters}
                 filterInventoryData={inventoryFilters}
                 productId={productId}
@@ -120,13 +131,13 @@ class OpenshiftView extends React.Component {
                 viewId={viewId}
               />
             </InventoryTab>
-            {!helpers.UI_DISABLED_TABLE_SUBSCRIPTIONS && (
+            {!helpers.UI_DISABLED_TABLE_SUBSCRIPTIONS && initialSubscriptionsInventoryFilters && (
               <InventoryTab
                 key={`inventory_subs_${productId}`}
                 title={t('curiosity-inventory.tab', { context: 'subscriptions' })}
               >
                 <InventorySubscriptions
-                  key={productId}
+                  key={`subs_${productId}`}
                   filterInventoryData={subscriptionsInventoryFilters}
                   productId={productId}
                   query={initialInventorySubscriptionsQuery}
@@ -136,252 +147,347 @@ class OpenshiftView extends React.Component {
             )}
           </InventoryTabs>
         </PageSection>
+      </React.Fragment>
+    );
+  }
+
+  /**
+   * Render an OpenShift view.
+   *
+   * @returns {Node}
+   */
+  render() {
+    const { productConfig, productLabel, query, t } = this.props;
+    const uomValue = query[RHSM_API_QUERY_TYPES.UOM];
+
+    return (
+      <PageLayout>
+        <PageHeader productLabel={productLabel} includeTour>
+          {t(`curiosity-view.title`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })}
+        </PageHeader>
+        <PageColumns>{productConfig.map(config => this.renderProduct(config, uomValue))}</PageColumns>
       </PageLayout>
     );
   }
 }
 
+/**
+ * FixMe: the viewId is used by viewSelectors.js, remove it!
+ * The viewId is used to help fire a render on UOM update,
+ * this is a hack until context and hooks can replace it.
+ */
 /**
  * Prop types.
  *
- * @type {{initialOption: string, inventorySubscriptionsQuery: object, query: object,
- *     initialSubscriptionsInventoryFilters: Array, initialInventorySettings: object, initialToolbarFilters: Array,
- *     t: Function, graphTallyQuery: object, inventoryHostsQuery: object, initialGraphFilters: Array,
- *     routeDetail: object, initialGuestsFilters: Array, initialInventoryFilters: Array, viewId: string}}
+ * @type {{productLabel: string, t: Function, routeDetail: object, productConfig: Array}}
  */
 OpenshiftView.propTypes = {
-  query: PropTypes.object,
-  graphTallyQuery: PropTypes.shape({
-    [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)]),
-    [RHSM_API_QUERY_TYPES.START_DATE]: PropTypes.string,
-    [RHSM_API_QUERY_TYPES.END_DATE]: PropTypes.string
-  }),
-  inventoryHostsQuery: PropTypes.shape({
-    [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
-    [RHSM_API_QUERY_TYPES.OFFSET]: PropTypes.number,
-    [RHSM_API_QUERY_TYPES.SORT]: PropTypes.oneOf([...Object.values(RHSM_API_QUERY_SORT_TYPES)]),
-    [RHSM_API_QUERY_TYPES.DIRECTION]: PropTypes.oneOf([...Object.values(SORT_DIRECTION_TYPES)])
-  }),
-  inventorySubscriptionsQuery: PropTypes.shape({
-    [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
-    [RHSM_API_QUERY_TYPES.OFFSET]: PropTypes.number,
-    [RHSM_API_QUERY_TYPES.SORT]: PropTypes.oneOf([...Object.values(RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES)]),
-    [RHSM_API_QUERY_TYPES.DIRECTION]: PropTypes.oneOf([...Object.values(SORT_DIRECTION_TYPES)])
-  }),
-  initialOption: PropTypes.oneOf(Object.values(RHSM_API_QUERY_UOM_TYPES)),
-  initialGraphFilters: PropTypes.array,
-  initialGuestsFilters: PropTypes.array,
-  initialInventoryFilters: PropTypes.array,
-  initialInventorySettings: PropTypes.shape({
-    hasGuests: PropTypes.func
-  }),
-  initialSubscriptionsInventoryFilters: PropTypes.array,
-  initialToolbarFilters: PropTypes.array,
+  productConfig: PropTypes.arrayOf(
+    PropTypes.shape({
+      productContextFilterUom: PropTypes.bool,
+      query: PropTypes.object,
+      graphTallyQuery: PropTypes.shape({
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)]),
+        [RHSM_API_QUERY_TYPES.START_DATE]: PropTypes.string,
+        [RHSM_API_QUERY_TYPES.END_DATE]: PropTypes.string
+      }),
+      inventoryHostsQuery: PropTypes.shape({
+        [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
+        [RHSM_API_QUERY_TYPES.OFFSET]: PropTypes.number,
+        [RHSM_API_QUERY_TYPES.SORT]: PropTypes.oneOf([...Object.values(RHSM_API_QUERY_SORT_TYPES)]),
+        [RHSM_API_QUERY_TYPES.DIRECTION]: PropTypes.oneOf([...Object.values(SORT_DIRECTION_TYPES)])
+      }),
+      inventorySubscriptionsQuery: PropTypes.shape({
+        [RHSM_API_QUERY_TYPES.LIMIT]: PropTypes.number,
+        [RHSM_API_QUERY_TYPES.OFFSET]: PropTypes.number,
+        [RHSM_API_QUERY_TYPES.SORT]: PropTypes.oneOf([...Object.values(RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES)]),
+        [RHSM_API_QUERY_TYPES.DIRECTION]: PropTypes.oneOf([...Object.values(SORT_DIRECTION_TYPES)])
+      }),
+      initialOption: PropTypes.oneOf(Object.values(RHSM_API_QUERY_UOM_TYPES)),
+      initialGraphFilters: PropTypes.array,
+      initialGuestsFilters: PropTypes.array,
+      initialInventoryFilters: PropTypes.array,
+      initialInventorySettings: PropTypes.shape({
+        hasGuests: PropTypes.func
+      }),
+      initialSubscriptionsInventoryFilters: PropTypes.array,
+      initialToolbarFilters: PropTypes.array,
+      productLabel: PropTypes.string,
+      productId: PropTypes.string,
+      viewId: PropTypes.string
+    })
+  ),
+  productLabel: PropTypes.string,
   routeDetail: PropTypes.shape({
     pathParameter: PropTypes.string,
     productParameter: PropTypes.string,
     viewParameter: PropTypes.string
   }).isRequired,
-  t: PropTypes.func,
-  viewId: PropTypes.string
+  query: PropTypes.object,
+  viewId: PropTypes.string, // eslint-disable-line
+  t: PropTypes.func
 };
 
+/**
+ * FixMe: the viewId is used by viewSelectors.js, remove it!
+ * The viewId is used to help fire a render on UOM update,
+ * this is a hack until context and hooks can replace it.
+ */
 /**
  * Default props.
  *
- * @type {{initialOption: string, inventorySubscriptionsQuery: object, query: object,
- *     initialSubscriptionsInventoryFilters: Array, initialInventorySettings: object, initialToolbarFilters: Array,
- *     t: translate, graphTallyQuery: object, inventoryHostsQuery: object,
- *     initialGraphFilters: Array, initialGuestsFilters: Array, initialInventoryFilters: Array, viewId: string}}
+ * @type {{productLabel: string, t: Function, productConfig: Array}}
  */
 OpenshiftView.defaultProps = {
-  query: {
-    [RHSM_API_QUERY_TYPES.UOM]: RHSM_API_QUERY_UOM_TYPES.CORES
-  },
-  graphTallyQuery: {
-    [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
-    [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).startDate.toISOString(),
-    [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
-  },
-  inventoryHostsQuery: {
-    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
-    [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
-    [RHSM_API_QUERY_TYPES.LIMIT]: 100,
-    [RHSM_API_QUERY_TYPES.OFFSET]: 0
-  },
-  inventorySubscriptionsQuery: {
-    [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.UPCOMING_EVENT_DATE,
-    [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
-    [RHSM_API_QUERY_TYPES.LIMIT]: 100,
-    [RHSM_API_QUERY_TYPES.OFFSET]: 0
-  },
-  initialOption: RHSM_API_QUERY_UOM_TYPES.CORES,
-  initialGraphFilters: [
-    {
-      id: 'cores',
-      isOptional: true,
-      fill: chartColorBlueLight.value,
-      stroke: chartColorBlueDark.value,
-      color: chartColorBlueDark.value
-    },
+  productConfig: [
     {
-      id: 'sockets',
-      isOptional: true,
-      fill: chartColorBlueLight.value,
-      stroke: chartColorBlueDark.value,
-      color: chartColorBlueDark.value
-    },
-    { id: 'thresholdSockets', isOptional: true },
-    { id: 'thresholdCores', isOptional: true }
-  ],
-  initialGuestsFilters: [
-    {
-      id: 'displayName',
-      header: translate('curiosity-inventory.header', { context: 'guestsDisplayName' }),
-      cell: (data, session) => {
-        const { displayName, inventoryId } = data;
-        const { inventory: authorized } = session?.authorized || {};
+      productContextFilterUom: true,
+      query: {
+        [RHSM_API_QUERY_TYPES.UOM]: RHSM_API_QUERY_UOM_TYPES.CORES
+      },
+      graphTallyQuery: {
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+        [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers
+          .getRangedDateTime(GRANULARITY_TYPES.DAILY)
+          .startDate.toISOString(),
+        [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
+      },
+      inventoryHostsQuery: {
+        [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
+        [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
+        [RHSM_API_QUERY_TYPES.LIMIT]: 100,
+        [RHSM_API_QUERY_TYPES.OFFSET]: 0
+      },
+      inventorySubscriptionsQuery: {
+        [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES.UPCOMING_EVENT_DATE,
+        [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
+        [RHSM_API_QUERY_TYPES.LIMIT]: 100,
+        [RHSM_API_QUERY_TYPES.OFFSET]: 0
+      },
+      initialOption: RHSM_API_QUERY_UOM_TYPES.CORES,
+      initialGraphFilters: [
+        {
+          id: 'cores',
+          isOptional: true,
+          fill: chartColorBlueLight.value,
+          stroke: chartColorBlueDark.value,
+          color: chartColorBlueDark.value
+        },
+        {
+          id: 'sockets',
+          isOptional: true,
+          fill: chartColorBlueLight.value,
+          stroke: chartColorBlueDark.value,
+          color: chartColorBlueDark.value
+        },
+        { id: 'thresholdSockets', isOptional: true },
+        { id: 'thresholdCores', isOptional: true }
+      ],
+      initialGuestsFilters: [
+        {
+          id: 'displayName',
+          header: translate('curiosity-inventory.header', { context: 'guestsDisplayName' }),
+          cell: (data, session) => {
+            const { displayName, inventoryId } = data;
+            const { inventory: authorized } = session?.authorized || {};
 
-        if (!inventoryId?.value) {
-          return displayName?.value;
-        }
+            if (!inventoryId?.value) {
+              return displayName?.value;
+            }
 
-        if (!authorized) {
-          return displayName?.value || inventoryId?.value;
+            if (!authorized) {
+              return displayName?.value || inventoryId?.value;
+            }
+
+            return (
+              <Button
+                isInline
+                component="a"
+                variant="link"
+                target="_blank"
+                href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
+              >
+                {displayName.value || inventoryId.value}
+              </Button>
+            );
+          }
+        },
+        {
+          id: 'inventoryId',
+          cellWidth: 40
+        },
+        {
+          id: 'lastSeen',
+          cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
+          cellWidth: 15
         }
+      ],
+      initialInventoryFilters: [
+        {
+          id: 'displayName',
+          cell: (data, session) => {
+            const { displayName = {}, inventoryId = {}, numberOfGuests = {} } = data;
+            const { inventory: authorized } = session?.authorized || {};
 
-        return (
-          <Button
-            isInline
-            component="a"
-            variant="link"
-            target="_blank"
-            href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
-          >
-            {displayName.value || inventoryId.value}
-          </Button>
-        );
-      }
-    },
-    {
-      id: 'inventoryId',
-      cellWidth: 40
-    },
-    {
-      id: 'lastSeen',
-      cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
-      cellWidth: 15
-    }
-  ],
-  initialInventoryFilters: [
-    {
-      id: 'displayName',
-      cell: (data, session) => {
-        const { displayName = {}, inventoryId = {}, numberOfGuests = {} } = data;
-        const { inventory: authorized } = session?.authorized || {};
+            if (!inventoryId.value) {
+              return displayName.value;
+            }
 
-        if (!inventoryId.value) {
-          return displayName.value;
-        }
+            let updatedDisplayName = displayName.value || inventoryId.value;
 
-        let updatedDisplayName = displayName.value || inventoryId.value;
+            if (authorized) {
+              updatedDisplayName = (
+                <Button
+                  isInline
+                  component="a"
+                  variant="link"
+                  target="_blank"
+                  href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
+                >
+                  {displayName.value || inventoryId.value}
+                </Button>
+              );
+            }
 
-        if (authorized) {
-          updatedDisplayName = (
-            <Button
-              isInline
-              component="a"
-              variant="link"
-              target="_blank"
-              href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
-            >
-              {displayName.value || inventoryId.value}
-            </Button>
-          );
+            return (
+              <React.Fragment>
+                {updatedDisplayName}{' '}
+                {(numberOfGuests.value &&
+                  translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [
+                    <PfLabel color="blue" />
+                  ])) ||
+                  ''}
+              </React.Fragment>
+            );
+          },
+          isSortable: true
+        },
+        {
+          id: 'sockets',
+          header: translate('curiosity-inventory.header', { context: 'sockets_OpenShift Container Platform' }),
+          isOptional: true,
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        },
+        {
+          id: 'cores',
+          header: translate('curiosity-inventory.header', { context: 'cores_OpenShift Container Platform' }),
+          isOptional: true,
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        },
+        {
+          id: 'lastSeen',
+          cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
         }
-
-        return (
-          <React.Fragment>
-            {updatedDisplayName}{' '}
-            {(numberOfGuests.value &&
-              translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [
-                <PfLabel color="blue" />
-              ])) ||
-              ''}
-          </React.Fragment>
-        );
-      },
-      isSortable: true
+      ],
+      initialInventorySettings: {},
+      initialSubscriptionsInventoryFilters: [
+        {
+          id: 'productName',
+          isSortable: true
+        },
+        {
+          id: 'serviceLevel',
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        },
+        {
+          id: 'upcomingEventDate',
+          cell: data =>
+            (data?.upcomingEventDate?.value && moment.utc(data?.upcomingEventDate?.value).format('YYYY-DD-MM')) || '',
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        }
+      ],
+      initialToolbarFilters: [
+        {
+          id: RHSM_API_QUERY_TYPES.SLA
+        }
+      ],
+      productLabel: 'OpenShift',
+      productId: RHSM_API_PATH_ID_TYPES.OPENSHIFT,
+      viewId: 'viewOpenShift'
     },
     {
-      id: 'measurementType',
-      cell: data => {
-        const { cloudProvider = {}, measurementType = {} } = data;
-        return (
-          <React.Fragment>
-            {translate('curiosity-inventory.measurementType', { context: measurementType.value })}{' '}
-            {(cloudProvider.value && (
-              <PfLabel color="purple">
-                {translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })}
-              </PfLabel>
-            )) ||
-              ''}
-          </React.Fragment>
-        );
+      query: {},
+      graphTallyQuery: {
+        [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
+        [RHSM_API_QUERY_TYPES.START_DATE]: dateHelpers
+          .getRangedDateTime(GRANULARITY_TYPES.DAILY)
+          .startDate.toISOString(),
+        [RHSM_API_QUERY_TYPES.END_DATE]: dateHelpers.getRangedDateTime(GRANULARITY_TYPES.DAILY).endDate.toISOString()
       },
-      isSortable: true,
-      cellWidth: 20
-    },
-    {
-      id: 'sockets',
-      isOptional: true,
-      isSortable: true,
-      isWrappable: true,
-      cellWidth: 15
-    },
-    {
-      id: 'cores',
-      isOptional: true,
-      isSortable: true,
-      isWrappable: true,
-      cellWidth: 15
-    },
-    {
-      id: 'lastSeen',
-      cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
-      isSortable: true,
-      isWrappable: true,
-      cellWidth: 15
-    }
-  ],
-  initialInventorySettings: {},
-  initialSubscriptionsInventoryFilters: [
-    {
-      id: 'productName',
-      isSortable: true
-    },
-    {
-      id: 'serviceLevel',
-      isSortable: true,
-      isWrappable: true,
-      cellWidth: 15
-    },
-    {
-      id: 'upcomingEventDate',
-      cell: data =>
-        (data?.upcomingEventDate?.value && moment.utc(data?.upcomingEventDate?.value).format('YYYY-DD-MM')) || '',
-      isSortable: true,
-      isWrappable: true,
-      cellWidth: 15
-    }
-  ],
-  initialToolbarFilters: [
-    {
-      id: RHSM_API_QUERY_TYPES.SLA
+      inventoryHostsQuery: {
+        [RHSM_API_QUERY_TYPES.SORT]: RHSM_API_QUERY_SORT_TYPES.LAST_SEEN,
+        [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
+        [RHSM_API_QUERY_TYPES.LIMIT]: 100,
+        [RHSM_API_QUERY_TYPES.OFFSET]: 0
+      },
+      initialGraphFilters: [
+        {
+          id: 'coreHours',
+          fill: chartColorBlueLight.value,
+          stroke: chartColorBlueDark.value,
+          color: chartColorBlueDark.value
+        }
+      ],
+      initialInventoryFilters: [
+        {
+          id: 'displayName',
+          cell: data => {
+            const { displayName = {}, inventoryId = {}, numberOfGuests = {} } = data;
+
+            if (!inventoryId.value) {
+              return displayName.value;
+            }
+
+            const updatedDisplayName = displayName.value || inventoryId.value;
+
+            return (
+              <React.Fragment>
+                {updatedDisplayName}{' '}
+                {(numberOfGuests.value &&
+                  translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [
+                    <PfLabel color="blue" />
+                  ])) ||
+                  ''}
+              </React.Fragment>
+            );
+          },
+          isSortable: true
+        },
+        {
+          id: 'coreHours',
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        },
+        {
+          id: 'lastSeen',
+          cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
+          isSortable: true,
+          isWrappable: true,
+          cellWidth: 15
+        }
+      ],
+      initialToolbarFilters: undefined,
+      productLabel: 'OpenShift Metric',
+      productId: RHSM_API_PATH_ID_TYPES.OPENSHIFT_METRICS,
+      viewId: 'viewOpenShiftMetric'
     }
   ],
-  t: translate,
-  viewId: 'viewOpenShift'
+  productLabel: RHSM_API_PATH_ID_TYPES.OPENSHIFT,
+  query: {},
+  viewId: 'viewOpenShift',  // eslint-disable-line
+  t: translate
 };
 
 /**
diff --git a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
index e656a7b30..c793d5bcf 100644
--- a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
+++ b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap
@@ -48,7 +48,7 @@ exports[`ProductView Component should allow custom toolbar components: custom to
         title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
       >
         <Connect(InventoryList)
-          key="lorem ipsum"
+          key="inv_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
@@ -60,7 +60,7 @@ exports[`ProductView Component should allow custom toolbar components: custom to
         title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
       >
         <Connect(InventorySubscriptions)
-          key="lorem ipsum"
+          key="subs_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
@@ -119,7 +119,7 @@ exports[`ProductView Component should allow custom toolbar components: custom to
         title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
       >
         <Connect(InventoryList)
-          key="lorem ipsum"
+          key="inv_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
@@ -131,7 +131,7 @@ exports[`ProductView Component should allow custom toolbar components: custom to
         title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
       >
         <Connect(InventorySubscriptions)
-          key="lorem ipsum"
+          key="subs_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
@@ -224,7 +224,7 @@ exports[`ProductView Component should render a non-connected component: non-conn
         title="t(curiosity-inventory.tab, {\\"context\\":\\"hosts\\"})"
       >
         <Connect(InventoryList)
-          key="lorem ipsum"
+          key="inv_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
@@ -236,7 +236,7 @@ exports[`ProductView Component should render a non-connected component: non-conn
         title="t(curiosity-inventory.tab, {\\"context\\":\\"subscriptions\\"})"
       >
         <Connect(InventorySubscriptions)
-          key="lorem ipsum"
+          key="subs_lorem ipsum"
           productId="lorem ipsum"
           query={Object {}}
           viewId="dolor sit"
diff --git a/src/components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap
index 9e6510a2e..34143805b 100644
--- a/src/components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap
+++ b/src/components/productView/__tests__/__snapshots__/productViewOpenShiftDedicated.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ProductViewOpenShiftDedicated Component should render a non-connected component: non-connected 1`] = `
-<Connect(ProductView)
+<ProductView
   productConfig={
     Object {
       "graphTallyQuery": Object {
@@ -55,6 +55,7 @@ exports[`ProductViewOpenShiftDedicated Component should render a non-connected c
       "productParameter": "dolor sit",
     }
   }
+  t={[Function]}
   toolbarGraph={
     <ToolbarFieldRangedMonthly
       options={
diff --git a/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap
index c8da20330..5ab77a267 100644
--- a/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap
+++ b/src/components/productView/__tests__/__snapshots__/productViewRhel.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ProductViewRhel Component should render a non-connected component: non-connected 1`] = `
-<Connect(ProductView)
+<ProductView
   productConfig={
     Object {
       "graphTallyQuery": Object {
@@ -124,6 +124,9 @@ exports[`ProductViewRhel Component should render a non-connected component: non-
       "productParameter": "dolor sit",
     }
   }
+  t={[Function]}
+  toolbarGraph={null}
+  toolbarProduct={null}
 />
 `;
 
diff --git a/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap
index bb30fffd6..0838cfb31 100644
--- a/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap
+++ b/src/components/productView/__tests__/__snapshots__/productViewSatellite.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ProductViewSatellite Component should render a non-connected component: non-connected 1`] = `
-<Connect(ProductView)
+<ProductView
   productConfig={
     Object {
       "graphTallyQuery": Object {
@@ -124,6 +124,9 @@ exports[`ProductViewSatellite Component should render a non-connected component:
       "productParameter": "dolor sit",
     }
   }
+  t={[Function]}
+  toolbarGraph={null}
+  toolbarProduct={null}
 />
 `;
 
diff --git a/src/components/productView/productView.js b/src/components/productView/productView.js
index f2c68410e..7b971d90c 100644
--- a/src/components/productView/productView.js
+++ b/src/components/productView/productView.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { PageLayout, PageHeader, PageSection, PageToolbar, PageMessages } from '../pageLayout/pageLayout';
-import { apiQueries, connect, reduxSelectors } from '../../redux';
+import { apiQueries } from '../../redux';
 import { ConnectedGraphCard, GraphCard } from '../graphCard/graphCard';
 import { ConnectedToolbar, Toolbar } from '../toolbar/toolbar';
 import { ConnectedInventoryList, InventoryList } from '../inventoryList/inventoryList';
@@ -115,7 +115,7 @@ const ProductView = ({ productConfig, routeDetail, t, toolbarGraph, toolbarProdu
         <InventoryTabs key={`inventory_${productId}`} productId={productId}>
           <InventoryTab key={`inventory_hosts_${productId}`} title={t('curiosity-inventory.tab', { context: 'hosts' })}>
             <ConnectedInventoryList
-              key={productId}
+              key={`inv_${productId}`}
               filterGuestsData={initialGuestsFilters}
               filterInventoryData={initialInventoryFilters}
               productId={productId}
@@ -130,7 +130,7 @@ const ProductView = ({ productConfig, routeDetail, t, toolbarGraph, toolbarProdu
               title={t('curiosity-inventory.tab', { context: 'subscriptions' })}
             >
               <ConnectedInventorySubscriptions
-                key={productId}
+                key={`subs_${productId}`}
                 filterInventoryData={initialSubscriptionsInventoryFilters}
                 productId={productId}
                 query={initialInventorySubscriptionsQuery}
@@ -198,13 +198,4 @@ ProductView.defaultProps = {
   toolbarProduct: null
 };
 
-/**
- * Create a selector from applied state, props.
- *
- * @type {Function}
- */
-const makeMapStateToProps = reduxSelectors.view.makeView(ProductView.defaultProps);
-
-const ConnectedProductView = connect(makeMapStateToProps)(ProductView);
-
-export { ConnectedProductView as default, ConnectedProductView, ProductView };
+export { ProductView as default, ProductView };
diff --git a/src/components/productView/productViewOpenShiftDedicated.js b/src/components/productView/productViewOpenShiftDedicated.js
index 65fb79aa0..266ea62dd 100644
--- a/src/components/productView/productViewOpenShiftDedicated.js
+++ b/src/components/productView/productViewOpenShiftDedicated.js
@@ -12,7 +12,7 @@ import {
   RHSM_API_QUERY_TYPES,
   RHSM_API_QUERY_SORT_TYPES
 } from '../../types/rhsmApiTypes';
-import { ConnectedProductView, ProductView } from './productView';
+import { ProductView } from './productView';
 import { translate } from '../i18n/i18n';
 import { dateHelpers } from '../../common';
 import { ToolbarFieldRangedMonthly } from '../toolbar/toolbarFieldRangedMonthly';
@@ -30,7 +30,7 @@ const ProductViewOpenShiftDedicated = ({ productConfig, routeDetail }) => {
   const { [RHSM_API_QUERY_TYPES.START_DATE]: startDate } = productConfig.graphTallyQuery;
 
   return (
-    <ConnectedProductView
+    <ProductView
       routeDetail={routeDetail}
       productConfig={productConfig}
       toolbarProduct={false}
diff --git a/src/components/productView/productViewRhel.js b/src/components/productView/productViewRhel.js
index 387dc06fd..5d8cdc487 100644
--- a/src/components/productView/productViewRhel.js
+++ b/src/components/productView/productViewRhel.js
@@ -18,7 +18,7 @@ import {
   RHSM_API_QUERY_SORT_TYPES,
   RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES
 } from '../../types/rhsmApiTypes';
-import { ConnectedProductView, ProductView } from './productView';
+import { ProductView } from './productView';
 import { translate } from '../i18n/i18n';
 import { dateHelpers, helpers } from '../../common';
 
@@ -31,7 +31,7 @@ import { dateHelpers, helpers } from '../../common';
  * @returns {Node}
  */
 const ProductViewRhel = ({ productConfig, routeDetail }) => (
-  <ConnectedProductView routeDetail={routeDetail} productConfig={productConfig} />
+  <ProductView routeDetail={routeDetail} productConfig={productConfig} />
 );
 
 /**
diff --git a/src/components/productView/productViewSatellite.js b/src/components/productView/productViewSatellite.js
index d2e65a8ca..2d15406b3 100644
--- a/src/components/productView/productViewSatellite.js
+++ b/src/components/productView/productViewSatellite.js
@@ -18,7 +18,7 @@ import {
   RHSM_API_QUERY_SORT_TYPES,
   RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES
 } from '../../types/rhsmApiTypes';
-import { ConnectedProductView, ProductView } from './productView';
+import { ProductView } from './productView';
 import { translate } from '../i18n/i18n';
 import { dateHelpers, helpers } from '../../common';
 
@@ -31,7 +31,7 @@ import { dateHelpers, helpers } from '../../common';
  * @returns {Node}
  */
 const ProductViewSatellite = ({ productConfig, routeDetail }) => (
-  <ConnectedProductView routeDetail={routeDetail} productConfig={productConfig} />
+  <ProductView routeDetail={routeDetail} productConfig={productConfig} />
 );
 
 /**
diff --git a/src/redux/selectors/__tests__/__snapshots__/viewSelectors.test.js.snap b/src/redux/selectors/__tests__/__snapshots__/viewSelectors.test.js.snap
index 52320ed16..fb3100af4 100644
--- a/src/redux/selectors/__tests__/__snapshots__/viewSelectors.test.js.snap
+++ b/src/redux/selectors/__tests__/__snapshots__/viewSelectors.test.js.snap
@@ -2,10 +2,6 @@
 
 exports[`ViewSelectors should pass minimal data on missing a reducer response: missing reducer error 1`] = `
 Object {
-  "graphTallyQuery": Object {},
-  "inventoryGuestsQuery": Object {},
-  "inventoryHostsQuery": Object {},
-  "inventorySubscriptionsQuery": Object {},
   "query": Object {},
 }
 `;
diff --git a/src/redux/selectors/viewSelectors.js b/src/redux/selectors/viewSelectors.js
index a2bdc3ff6..3d8cf391f 100644
--- a/src/redux/selectors/viewSelectors.js
+++ b/src/redux/selectors/viewSelectors.js
@@ -1,25 +1,9 @@
-import { createSelectorCreator, defaultMemoize } from 'reselect';
-import _isEqual from 'lodash/isEqual';
+import { createSelector } from 'reselect';
 
 /**
- * Create a custom "are objects equal" selector.
- *
- * @private
- * @type {Function}}
- */
-const createDeepEqualSelector = createSelectorCreator(defaultMemoize, _isEqual);
-
-/**
- * ToDo: as part of future potential upgrades consider moving reduxHelpers.setApiQuery into statePropsFilter
- * The side effect is multiple queries being dumped into the views, meaning more "configuration to handle".
- * Leaving it as a single query passed from this selector and handling the "setApiQuery" in "redux/common/apiQueries"
- * is a first step.
- * i.e.
- * queries: {
- *    query: ...,
- *    graph: reduxHelpers.setApiQuery(..., RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES),
- *    inventory: reduxHelpers.setApiQuery(..., RHSM_API_QUERY_SET_INVENTORY_TYPES)
- * }
+ * FixMe: Remove this selector, switch fully over to context and hooks for products!
+ * This selector is currently used as a hack by the openshiftView.js to fire a component
+ * render for UOM selection. This needs to be fixed!
  */
 /**
  * Return a combined state, props object.
@@ -34,45 +18,23 @@ const statePropsFilter = (state = {}, props, defaultProps = {}) => ({
   query: {
     ...defaultProps.query,
     ...state.view?.query?.[defaultProps.viewId]
-  },
-  graphTallyQuery: {
-    ...defaultProps.graphTallyQuery,
-    ...state.view?.graphTallyQuery?.[defaultProps.viewId]
-  },
-  inventoryGuestsQuery: {
-    ...defaultProps.inventoryGuestsQuery,
-    ...state.view?.inventoryGuestsQuery?.[defaultProps.viewId]
-  },
-  inventoryHostsQuery: {
-    ...defaultProps.inventoryHostsQuery,
-    ...state.view?.inventoryHostsQuery?.[defaultProps.viewId]
-  },
-  inventorySubscriptionsQuery: {
-    ...defaultProps.inventorySubscriptionsQuery,
-    ...state.view?.inventorySubscriptionsQuery?.[defaultProps.viewId]
   }
 });
 
 /**
  * Create selector, transform combined state, props into a consumable API param/query object.
  *
- * @type {{query: object, graphTallyQuery: object, inventoryGuestsQuery: object, inventoryHostsQuery: object,
- *     inventorySubscriptionsQuery: object}}
+ * @type {{query: object}}
  */
-const selector = createDeepEqualSelector([statePropsFilter], view => ({
-  query: { ...view.query },
-  graphTallyQuery: { ...view.graphTallyQuery },
-  inventoryGuestsQuery: { ...view.inventoryGuestsQuery },
-  inventoryHostsQuery: { ...view.inventoryHostsQuery },
-  inventorySubscriptionsQuery: { ...view.inventorySubscriptionsQuery }
+const selector = createSelector([statePropsFilter], view => ({
+  query: { ...view.query }
 }));
 
 /**
  * Expose selector instance. For scenarios where a selector is reused across component instances.
  *
  * @param {object} defaultProps
- * @returns {{query: object, graphTallyQuery: object, inventoryGuestsQuery: object, inventoryHostsQuery: object,
- *     inventorySubscriptionsQuery: object}}
+ * @returns {{query: object}}
  */
 const makeSelector = defaultProps => (state, props) => ({
   ...selector(state, props, defaultProps)