diff --git a/config/webpack/webpack.config.dev.js b/config/webpack/webpack.config.dev.js
index de2ccca..4bb3274 100644
--- a/config/webpack/webpack.config.dev.js
+++ b/config/webpack/webpack.config.dev.js
@@ -47,6 +47,7 @@ module.exports = WebpackMerge(configBase, {
                     Path.resolve(__dirname, '../../node_modules/')
                 ]
             },
+            { test: /\.jpg$/, loader: 'file' },
             // {
             //     test: /\.tsx?$/,
             //     loaders: [
diff --git a/package.json b/package.json
index 4fa6faa..0ab352d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "test": "yarn run jest",
     "test:watch": "yarn run jest -- --watch",
     "jest": "PWD=$(pwd) NODE_ENV=test ./node_modules/.bin/jest -w 1 --coverage",
-    "prebuild": "./node_modules/.bin/check-dependencies && yarn run clean",
     "build": "set NODE_ENV=production && ./node_modules/.bin/webpack-dashboard -m -- ./node_modules/.bin/webpack --progress --profile --colors --config ./config/webpack/webpack.config.prod.js",
     "lint": "./node_modules/.bin/tslint -c tslint.json 'src/ts/**/*.{ts,tsx}' && ./node_modules/.bin/sass-lint 'src/**/*.scss'",
     "stats": "set NODE_ENV=production && webpack --progress --config ./config/webpack/webpack.config.stats.js --profile --json > ./config/webpack/stats/stats.json"
@@ -87,7 +86,8 @@
     "redux-saga": "^0.15.4",
     "reflect-metadata": "^0.1.10",
     "reselect": "^3.0.1",
-    "semantic-ui-react": "^0.71.1"
+    "semantic-ui-react": "^0.71.1",
+    "image-webpack-loader": "^3.3.1"
   },
   "jest": {
     "moduleFileExtensions": [
diff --git a/src/ts/@overflow/app/views/layout/LogoBar.tsx b/src/ts/@overflow/app/views/layout/LogoBar.tsx
index 5a5ad68..6d23e15 100644
--- a/src/ts/@overflow/app/views/layout/LogoBar.tsx
+++ b/src/ts/@overflow/app/views/layout/LogoBar.tsx
@@ -4,9 +4,11 @@ import {
   Header,
   Container,
   Popup,
+  Image,
 } from 'semantic-ui-react';
 import { Notification } from '@overflow/commons/react/component/Notification';
 
+
 export class LogoBar extends React.Component<any, any> {
 
   constructor(props: any, context: any) {
diff --git a/src/ts/@overflow/meta/react/components/SensorItemTree.tsx b/src/ts/@overflow/meta/react/components/SensorItemTree.tsx
index f324b4b..c69182e 100644
--- a/src/ts/@overflow/meta/react/components/SensorItemTree.tsx
+++ b/src/ts/@overflow/meta/react/components/SensorItemTree.tsx
@@ -142,14 +142,14 @@ export class SensorItemTree extends React.Component<SensorItemTreeProps, SensorI
     SensorJsonData.map((data: any, idx: number) => {
       let sensorItem: MetaSensorItem = data;
 
-      if (this.itemMap.has(sensorItem.metaSensorItemType.id)) {
-        this.itemMap.get(sensorItem.metaSensorItemType.id).metaSensorItemList.push(sensorItem);
+      if (this.itemMap.has(sensorItem.itemType.id)) {
+        this.itemMap.get(sensorItem.itemType.id).metaSensorItemList.push(sensorItem);
       } else {
         let item: TreeItem = { metaSensorItemList: null, metaSensorItemType: null };
         item.metaSensorItemList = [];
         item.metaSensorItemList.push(sensorItem);
-        item.metaSensorItemType = this.GetMetaSensorItemType(sensorItem.metaSensorItemType.id);
-        this.itemMap.set(sensorItem.metaSensorItemType.id, item);
+        item.metaSensorItemType = this.GetMetaSensorItemType(sensorItem.itemType.id);
+        this.itemMap.set(sensorItem.itemType.id, item);
       }
     });
   }
diff --git a/src/ts/@overflow/probe/react/components/ProbeHost.tsx b/src/ts/@overflow/probe/react/components/ProbeHost.tsx
index b504fc3..1ccc3ba 100644
--- a/src/ts/@overflow/probe/react/components/ProbeHost.tsx
+++ b/src/ts/@overflow/probe/react/components/ProbeHost.tsx
@@ -103,7 +103,7 @@ export class ProbeHost extends React.Component<Props, State> {
               <Table.Cell collapsing>
                 <Header size='small'>OS vendor type</Header>
               </Table.Cell>
-              <Table.Cell>{this.state.host.os.vendor.type.name}</Table.Cell>
+              <Table.Cell>{this.state.host.os.vendor.infraType.name}</Table.Cell>
             </Table.Row>
           </Table.Body>
         </Table>
diff --git a/src/ts/@overflow/sensor/react/components/SensorDetail.tsx b/src/ts/@overflow/sensor/react/components/SensorDetail.tsx
index 69e6d6c..2392a8b 100644
--- a/src/ts/@overflow/sensor/react/components/SensorDetail.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorDetail.tsx
@@ -99,7 +99,7 @@ export class SensorBasicInfo extends React.Component<SensorBasicInfoProps, Senso
               <Table.Cell>
                 <Header size='small'>Name</Header>
               </Table.Cell>
-              <Table.Cell>{this.state.sensor.target.infra.type.name}</Table.Cell>
+              <Table.Cell>{this.state.sensor.target.displayName}</Table.Cell>
             </Table.Row>
             <Table.Row>
               <Table.Cell>
diff --git a/src/ts/@overflow/sensor/react/components/SensorDetailInfo.tsx b/src/ts/@overflow/sensor/react/components/SensorDetailInfo.tsx
index 1ead606..4a59de8 100644
--- a/src/ts/@overflow/sensor/react/components/SensorDetailInfo.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorDetailInfo.tsx
@@ -62,7 +62,7 @@ export class SensorDetailInfo extends React.Component<SensorDetailInfoProps, Sen
               <Table.Cell>
                 <Header size='small'>Name</Header>
               </Table.Cell>
-              <Table.Cell>{this.state.sensor.target.infra.type.name}</Table.Cell>
+              <Table.Cell>{this.state.sensor.target.displayName}</Table.Cell>
             </Table.Row>
             <Table.Row>
               <Table.Cell>
diff --git a/src/ts/@overflow/sensor/react/components/SensorDetailItems.tsx b/src/ts/@overflow/sensor/react/components/SensorDetailItems.tsx
index bc9d466..39f5c7d 100644
--- a/src/ts/@overflow/sensor/react/components/SensorDetailItems.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorDetailItems.tsx
@@ -52,7 +52,7 @@ export class SensorDetailItems extends React.Component<Props, State> {
                 return (
                   <Table.Row key={idx}>
                     <Table.Cell>{idx}</Table.Cell>
-                    <Table.Cell>{sensorItem.item.metaSensorItemType.name}</Table.Cell>
+                    <Table.Cell>{sensorItem.item.itemType.name}</Table.Cell>
                     <Table.Cell>{sensorItem.item.name}</Table.Cell>
                     <Table.Cell>{sensorItem.item.key}</Table.Cell>
                   </Table.Row>