diff --git a/ui/src/config/router.js b/ui/src/config/router.js
index f15919e240b..d7f29670981 100644
--- a/ui/src/config/router.js
+++ b/ui/src/config/router.js
@@ -33,6 +33,7 @@ export function generateRouterMap (section) {
         path: '/' + child.name,
         meta: {
           title: child.title,
+          name: child.name,
           keepAlive: true,
           icon: child.icon,
           permission: child.permission,
@@ -49,6 +50,7 @@ export function generateRouterMap (section) {
             path: '/' + child.name + '/:id',
             meta: {
               title: child.title,
+              name: child.name,
               keepAlive: true,
               icon: child.icon,
               permission: child.permission,
@@ -73,6 +75,7 @@ export function generateRouterMap (section) {
             path: '/action/' + action.api,
             meta: {
               title: child.title,
+              name: child.name,
               keepAlive: true,
               permission: [ action.api ]
             },
@@ -91,6 +94,7 @@ export function generateRouterMap (section) {
       actions: section.actions ? section.actions : [],
       meta: {
         title: section.title,
+        name: section.name,
         keepAlive: true,
         icon: section.icon,
         permission: section.permission,
diff --git a/ui/src/views/common/InfoCard.vue b/ui/src/views/common/InfoCard.vue
index 97c0dc4abbd..aa2919dcd66 100644
--- a/ui/src/views/common/InfoCard.vue
+++ b/ui/src/views/common/InfoCard.vue
@@ -5,20 +5,38 @@
       <div class="resource-details">
         <div class="avatar">
           <slot name="avatar">
-            <a-icon style="font-size: 36px" :type="$route.meta.icon" />
+            <os-logo v-if="resource.ostypeid || resource.ostypename" :osId="resource.ostypeid" :osName="resource.ostypename" size="4x" />
+            <a-icon v-else style="font-size: 36px" :type="$route.meta.icon" />
           </slot>
         </div>
         <div class="name">
           <slot name="name">
             <h4>
-              {{ resource.name }}
+              {{ resource.displayname || resource.name }}
+              <a
+                v-if="['vm', 'systemvm', 'router'].includes($route.meta.name)"
+                :href="'/client/console?cmd=access&vm=' + resource.id"
+                target="_blank">
+                <a-button shape="circle" >
+                  <a-icon type="code" />
+                </a-button>
+              </a>
             </h4>
+            <a-tag v-if="resource.instancename">
+              {{ resource.instancename }}
+            </a-tag>
             <a-tag v-if="resource.type">
               {{ resource.type }}
             </a-tag>
             <a-tag v-if="resource.hypervisor">
               {{ resource.hypervisor }}
             </a-tag>
+            <a-tag v-if="'haenable' in resource" :color="resource.haenable ? 'green': 'red'">
+              {{ $t('haenable') }}
+            </a-tag>
+            <a-tag v-if="'isdynamicallyscalable' in resource" :color="resource.isdynamicallyscalable ? 'green': 'red'">
+              {{ $t('isdynamicallyscalable') }}
+            </a-tag>
           </slot>
         </div>
       </div>
@@ -37,17 +55,110 @@
         </a-tooltip>
         <span style="margin-left: 5px;">{{ resource.id }}</span>
       </div>
+      <div class="resource-detail-item" v-if="resource.ostypename && resource.ostypeid">
+        <os-logo :osId="resource.ostypeid" :osName="resource.ostypename" size="lg" style="margin-left: -1px" />
+        <span style="margin-left: 8px">{{ resource.ostypename }}</span>
+      </div>
+
       <div class="resource-detail-item">
         <slot name="details">
         </slot>
       </div>
+
+      <div class="resource-detail-item" v-if="resource.keypair">
+        <a-icon type="key" />
+        <router-link :to="{ path: '/ssh/?name=' + resource.keypair }">{{ resource.keypair}}</router-link>
+      </div>
+      <div class="resource-detail-item" v-if="resource.group">
+        <a-icon type="gold" />{{ resource.group }}
+      </div>
+      <div class="resource-detail-item" v-if="resource.cpunumber && resource.cpuspeed">
+        <a-icon type="appstore" />{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz
+        <span
+          v-if="resource.cpuused"
+          style="display: flex; padding-left: 25px">
+          {{ $t('cpuusedghz') }}
+          <a-progress
+            v-if="resource.cpuused"
+            style="padding-left: 10px"
+            size="small"
+            status="active"
+            :percent="parseFloat(resource.cpuused)" />
+        </span>
+        <span
+          v-if="resource.cpuallocated"
+          style="display: flex; padding-left: 25px">
+          {{ $t('cpuallocatedghz') }}
+          <a-progress
+            style="padding-left: 10px"
+            size="small"
+            :percent="parseFloat(resource.cpuallocated)" />
+        </span>
+      </div>
+      <div class="resource-detail-item" v-if="resource.memory">
+        <a-icon type="bulb" />{{ resource.memory }} MB Memory
+        <span
+          v-if="resource.memorykbs && resource.memoryintfreekbs"
+          style="display: flex; padding-left: 25px">
+          {{ $t('memoryusedgb') }}
+          <a-progress
+            style="padding-left: 10px"
+            size="small"
+            status="active"
+            :percent="Number(parseFloat(100.0 * (resource.memorykbs - resource.memoryintfreekbs) / resource.memorykbs).toFixed(2))" />
+        </span>
+      </div>
+      <div class="resource-detail-item" v-else-if="resource.memorytotal">
+        <a-icon type="bulb" />{{ parseFloat(resource.memorytotal / (1024.0 * 1024.0 * 1024.0)).toFixed(2) }} GB Memory
+        <span
+          v-if="resource.memoryused"
+          style="display: flex; padding-left: 25px">
+          {{ $t('memoryusedgb') }}
+          <a-progress
+            style="padding-left: 10px"
+            size="small"
+            status="active"
+            :percent="Number(parseFloat(100.0 * (resource.memoryused) / resource.memorytotal).toFixed(2))" />
+        </span>
+        <span
+          v-if="resource.memoryallocated"
+          style="display: flex; padding-left: 25px">
+          {{ $t('memoryallocatedgb') }}
+          <a-progress
+            style="padding-left: 10px"
+            size="small"
+            :percent="Number(parseFloat(100.0 * (resource.memoryallocated) / resource.memorytotal).toFixed(2))" />
+        </span>
+      </div>
+      <div class="resource-detail-item" v-if="resource.totalStorage">
+        <a-icon type="hdd" />{{ (resource.totalStorage / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage
+        <div style="margin-left: 25px" v-if="resource.diskkbsread && resource.diskkbswrite && resource.diskioread && resource.diskiowrite">
+          <a-tag>Read {{ toSize(resource.diskkbsread) }}</a-tag>
+          <a-tag>Write {{ toSize(resource.diskkbswrite) }}</a-tag><br/>
+          <a-tag>Read (IO) {{ resource.diskioread }}</a-tag>
+          <a-tag>Write (IO) {{ resource.diskiowrite }}</a-tag>
+        </div>
+      </div>
+      <div class="resource-detail-item" v-if="resource.nic || ('networkkbsread' in resource && 'networkkbswrite' in resource)">
+        <a-icon type="wifi" />
+        <span v-if="'networkkbsread' in resource && 'networkkbswrite' in resource">
+          <a-tag><a-icon type="arrow-down" /> RX {{ toSize(resource.networkkbsread) }}</a-tag>
+          <a-tag><a-icon type="arrow-up" /> TX {{ toSize(resource.networkkbswrite) }}</a-tag>
+        </span>
+        <span v-else>{{ resource.nic.length }} NIC(s)
+        </span>
+        <div style="margin-left: 25px" v-if="resource.nic" v-for="(eth, index) in resource.nic" :key="eth.id">
+          <a-icon type="api" />eth{{ index }} {{ eth.ipaddress }}
+          <router-link v-if="eth.networkname && eth.networkid" :to="{ path: '/guestnetwork/' + eth.networkid }">({{ eth.networkname }})</router-link>
+        </div>
+      </div>
       <div class="resource-detail-item" v-if="resource.ipaddress">
         <a-icon type="environment" class="resource-detail-item"/>
         <span v-if="resource.nic && resource.nic.length > 0">{{ resource.nic.filter(e => { return e.ipaddress }).map(e => { return e.ipaddress }).join(', ') }}</span>
         <span v-else>{{ resource.ipaddress }}</span>
       </div>
       <div class="resource-detail-item" v-if="resource.virtualmachineid">
-        <a-icon type="desktop" class="resource-detail-item"/>
+        <a-icon type="laptop" class="resource-detail-item"/>
         <router-link :to="{ path: '/vm/' + resource.virtualmachineid }">{{ resource.vmname || resource.vm || resource.virtualmachinename || resource.virtualmachineid }} </router-link>
         <status style="margin-top: -5px" :text="resource.vmstate" v-if="resource.vmstate"/>
       </div>
@@ -75,6 +186,10 @@
         <a-icon type="deployment-unit" class="resource-detail-item"/>
         <router-link :to="{ path: '/vpcoffering/' + resource.vpcofferingid }">{{ resource.vpcofferingname || resource.vpcofferingid }} </router-link>
       </div>
+      <div class="resource-detail-item" v-if="resource.guestnetworkid">
+        <a-icon type="gateway" class="resource-detail-item"/>
+        <router-link :to="{ path: '/guestnetwork/' + resource.guestnetworkid }">{{ resource.guestnetworkname || resource.guestnetworkid }} </router-link>
+      </div>
       <div class="resource-detail-item" v-if="resource.storageid">
         <a-icon type="database" class="resource-detail-item"/>
         <router-link :to="{ path: '/storagepool/' + resource.storageid }">{{ resource.storage || resource.storageid }} </router-link>
@@ -244,11 +359,13 @@
 <script>
 
 import { api } from '@/api'
+import OsLogo from '@/components/widgets/OsLogo'
 import Status from '@/components/widgets/Status'
 
 export default {
   name: 'InfoCard',
   components: {
+    OsLogo,
     Status
   },
   props: {
@@ -313,6 +430,18 @@ export default {
     }
   },
   methods: {
+    toSize (kb) {
+      if (!kb) {
+        return '0 KB'
+      }
+      if (kb < 1024) {
+        return kb + ' KB'
+      }
+      if (kb < 1024 * 1024) {
+        return parseFloat(kb / 1024.0).toFixed(2) + ' MB'
+      }
+      return parseFloat(kb / (1024.0 * 1024.0)).toFixed(2) + ' GB'
+    },
     getUserKeys () {
       if (!('getUserKeys' in this.$store.getters.apis)) {
         return
diff --git a/ui/src/views/compute/InstanceView.vue b/ui/src/views/compute/InstanceView.vue
index 3754dad789a..dbe5650a30e 100644
--- a/ui/src/views/compute/InstanceView.vue
+++ b/ui/src/views/compute/InstanceView.vue
@@ -1,80 +1,6 @@
 <template>
   <resource-layout>
-    <info-card slot="left" :resource="resource" :loading="loading">
-      <div slot="avatar">
-        <font-awesome-icon :icon="['fab', osLogo]" size="4x" style="color: #666;" />
-      </div>
-      <div slot="name">
-        <h4>{{ vm.displayname || vm.name }}
-          <a :href="'/client/console?cmd=access&vm=' + vm.id" target="_blank">
-            <a-button shape="circle" >
-              <a-icon type="code" />
-            </a-button>
-          </a>
-        </h4>
-        <div>
-          <a-tag>{{ vm.instancename }}</a-tag>
-          <a-tag>{{ vm.hypervisor }}</a-tag> <br/>
-          <a-tag :color="vm.haenable ? 'green': 'red'">{{ $t('haenable') }}</a-tag>
-          <a-tag :color="vm.isdynamicallyscalable ? 'green': 'red'">{{ $t('isdynamicallyscalable') }}</a-tag>
-        </div>
-      </div>
-      <div slot="details">
-        <div class="vm-detail">
-          <font-awesome-icon :icon="['fab', osLogo]" size="lg"/>{{ guestOsName }}
-        </div>
-        <div class="vm-detail" v-if="vm.keypair">
-          <a-icon type="key" />
-          <router-link :to="{ path: '/ssh/?name=' + vm.keypair }">
-            <span style="margin-left: 10px">{{ vm.keypair }}</span>
-          </router-link>
-        </div>
-        <div class="vm-detail">
-          <a-icon type="laptop" />
-          <span class="vm-detail">{{ vm.cputotal }} ({{ vm.cpunumber }} CPU x {{ vm.cpuspeed }} Mhz)</span>
-          <a-progress
-            style="padding-left: 25px"
-            size="small"
-            :percent="vm && vm.cpuused ? parseFloat(vm.cpuused) : 0.0" />
-        </div>
-        <div class="vm-detail">
-          <a-icon type="appstore" />
-          <span class="vm-detail">{{ vm.memory }} MB Memory
-          </span>
-          <a-progress
-            style="padding-left: 25px"
-            size="small"
-            :percent="vm && vm.memorykbs && vm.memoryintfreekbs && vm.memorykbs > vm.memoryintfreekbs ?
-              Number(parseFloat(100.0 * (vm.memorykbs - vm.memoryintfreekbs) / vm.memorykbs).toFixed(2)) : 0.0" />
-        </div>
-        <div class="vm-detail">
-          <a-icon type="hdd" />
-          <span class="vm-detail" style="margin-left: 10px">{{ (totalStorage / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage
-          </span>
-          <div style="margin-left: 25px">
-            <a-tag>Read {{ toSize(vm.diskkbsread) }}</a-tag>
-            <a-tag>Write {{ toSize(vm.diskkbswrite) }}</a-tag><br/>
-            <a-tag>Read (IO) {{ vm.diskioread }}</a-tag>
-            <a-tag>Write (IO) {{ vm.diskiowrite }}</a-tag>
-          </div>
-        </div>
-        <div class="vm-detail">
-          <a-icon type="wifi" />
-          <span style="margin-left: 10px">
-            <a-tag><a-icon type="arrow-down" /> RX {{ toSize(vm.networkkbsread) }}</a-tag>
-            <a-tag><a-icon type="arrow-up" /> TX {{ toSize(vm.networkkbswrite) }}</a-tag>
-          </span>
-          <div style="margin-left: 25px" v-for="(eth, index) in vm.nic" :key="eth.id">
-            <a-icon type="api"/> eth{{ index }} {{ eth.ipaddress }}
-            (<router-link :to="{ path: '/guestnetwork/' + eth.networkid }">{{ eth.networkname }}</router-link>)
-          </div>
-        </div>
-        <div class="vm-detail" v-if="vm.group">
-          <a-icon type="gold" />
-          <span style="margin-left: 8px">{{ vm.group }}</span>
-        </div>
-      </div>
-    </info-card>
+    <info-card slot="left" :resource="resource" :loading="loading" />
 
     <div slot="right">
       <a-card
@@ -205,8 +131,6 @@ export default {
       vm: {},
       volumes: [],
       totalStorage: 0,
-      guestOsName: '',
-      osLogo: 'linux',
       activeKey: ['1', '2', '3'],
       settingsColumns: [
         {
@@ -234,18 +158,6 @@ export default {
     }
   },
   methods: {
-    toSize (kb) {
-      if (!kb) {
-        return '0 KB'
-      }
-      if (kb < 1024) {
-        return kb + ' KB'
-      }
-      if (kb < 1024 * 1024) {
-        return parseFloat(kb / 1024.0).toFixed(2) + ' MB'
-      }
-      return parseFloat(kb / (1024.0 * 1024.0)).toFixed(2) + ' GB'
-    },
     fetchData () {
       this.volumes = []
       api('listVolumes', { 'listall': true, 'virtualmachineid': this.vm.id }).then(json => {
@@ -257,33 +169,7 @@ export default {
         for (var volume of this.volumes) {
           this.totalStorage += volume.size
         }
-      })
-      api('listOsTypes', { 'id': this.vm.ostypeid }).then(json => {
-        this.guestOsName = json.listostypesresponse.ostype[0].description
-        const osname = this.guestOsName.toLowerCase()
-        if (osname.includes('centos')) {
-          this.osLogo = 'centos'
-        } else if (osname.includes('ubuntu')) {
-          this.osLogo = 'ubuntu'
-        } else if (osname.includes('suse')) {
-          this.osLogo = 'suse'
-        } else if (osname.includes('redhat')) {
-          this.osLogo = 'redhat'
-        } else if (osname.includes('fedora')) {
-          this.osLogo = 'fedora'
-        } else if (osname.includes('linux')) {
-          this.osLogo = 'linux'
-        } else if (osname.includes('bsd')) {
-          this.osLogo = 'freebsd'
-        } else if (osname.includes('apple')) {
-          this.osLogo = 'apple'
-        } else if (osname.includes('window') || osname.includes('dos')) {
-          this.osLogo = 'windows'
-        } else if (osname.includes('oracle')) {
-          this.osLogo = 'java'
-        } else {
-          this.osLogo = 'linux'
-        }
+        this.resource.totalStorage = this.totalStorage
       })
     }
   }