diff --git a/ui/src/views/common/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
similarity index 100%
rename from ui/src/views/common/DetailsTab.vue
rename to ui/src/components/view/DetailsTab.vue
diff --git a/ui/src/components/widgets/FormView.vue b/ui/src/components/view/FormView.vue
similarity index 100%
rename from ui/src/components/widgets/FormView.vue
rename to ui/src/components/view/FormView.vue
diff --git a/ui/src/views/common/InfoCard.vue b/ui/src/components/view/InfoCard.vue
similarity index 100%
rename from ui/src/views/common/InfoCard.vue
rename to ui/src/components/view/InfoCard.vue
diff --git a/ui/src/components/widgets/ListView.vue b/ui/src/components/view/ListView.vue
similarity index 100%
rename from ui/src/components/widgets/ListView.vue
rename to ui/src/components/view/ListView.vue
diff --git a/ui/src/views/common/ResourceView.vue b/ui/src/components/view/ResourceView.vue
similarity index 92%
rename from ui/src/views/common/ResourceView.vue
rename to ui/src/components/view/ResourceView.vue
index 0fe6e8b6c28..3a8193e8531 100644
--- a/ui/src/views/common/ResourceView.vue
+++ b/ui/src/components/view/ResourceView.vue
@@ -29,8 +29,8 @@
 
 <script>
 
-import DetailsTab from '@/views/common/DetailsTab'
-import InfoCard from '@/views/common/InfoCard'
+import DetailsTab from '@/components/view/DetailsTab'
+import InfoCard from '@/components/view/InfoCard'
 import ResourceLayout from '@/layouts/ResourceLayout'
 
 export default {
diff --git a/ui/src/components/widgets/CardView.vue b/ui/src/components/widgets/CardView.vue
deleted file mode 100644
index 82e00262ba0..00000000000
--- a/ui/src/components/widgets/CardView.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <a-row :gutter="12">
-    <a-col v-for="item in items" :md="24" :lg="6" :key="item.id">
-      <a-card
-        hoverable
-        style="margin-bottom: 12px">
-        <template class="ant-card-actions" slot="actions">
-          <a-icon type="edit" />
-          <a-icon type="setting" />
-          <a-icon type="ellipsis" />
-        </template>
-        <a-card-meta>
-          <div slot="avatar">
-            <a-icon :type="$route.meta.icon" style="padding-right: 5px" />
-          </div>
-          <div slot="title">
-            <router-link :to="{ path: $route.path + '/' + item.id }" v-if="item.id">{{ item.name || item.displayname }}</router-link>
-            <span v-else>{{ item.name }}</span>
-          </div>
-          <div slot="description" style="height: 80px">
-            <status :text="item.state ? item.state : ''" displayText />
-            <div v-if="item.ipaddress">
-              <a-icon type="wifi" style="padding-right: 5px" />
-              <router-link :to="{ path: $route.path + '/' + item.id }">{{ item.ipaddress }}</router-link>
-            </div>
-            <div v-if="item.vmname">
-              <a-icon type="desktop" style="padding-right: 5px" />
-              <router-link :to="{ path: '/vm/' + item.virtualmachineid }">{{ item.vmname }}</router-link>
-            </div>
-            <div v-if="item.zonename">
-              <a-icon type="table" style="padding-right: 5px" />
-              <router-link :to="{ path: '/zone/' + item.zoneid }">{{ item.zonename }}</router-link>
-            </div>
-          </div>
-        </a-card-meta>
-      </a-card>
-    </a-col>
-  </a-row>
-</template>
-
-<script>
-
-import ChartCard from '@/components/chart/ChartCard'
-import Status from '@/components/widgets/Status'
-
-export default {
-  name: 'CardView',
-  components: {
-    ChartCard,
-    Status
-  },
-  props: {
-    items: {
-      type: Array,
-      required: true
-    },
-    loading: {
-      type: Boolean,
-      default: false
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/ui/src/config/router.js b/ui/src/config/router.js
index 66ef5563fb5..1efd66f1d7b 100644
--- a/ui/src/config/router.js
+++ b/ui/src/config/router.js
@@ -205,7 +205,7 @@ export const constantRouterMap = [
       {
         path: 'login',
         name: 'login',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/user/Login')
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/auth/Login')
       }
     ]
   },
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 1b236cdb8b2..bb887067770 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -61,7 +61,7 @@ export default {
           label: 'label.action.stop.instance',
           dataView: true,
           groupAction: true,
-          args: ['id'],
+          args: ['id', 'forced'],
           show: (record) => { return ['Running'].includes(record.state) }
         },
         {
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js
index 945979b164e..27afbe787e7 100644
--- a/ui/src/config/section/image.js
+++ b/ui/src/config/section/image.js
@@ -26,7 +26,7 @@ export default {
           label: 'Upload Local Template',
           listView: true,
           popup: true,
-          component: () => import('@/views/storage/UploadLocalTemplate.vue')
+          component: () => import('@/views/image/UploadLocalTemplate.vue')
         },
         {
           api: 'updateTemplate',
@@ -88,7 +88,7 @@ export default {
           label: 'Upload Local Iso',
           listView: true,
           popup: true,
-          component: () => import('@/views/storage/UploadLocalIso.vue')
+          component: () => import('@/views/image/UploadLocalIso.vue')
         },
         {
           api: 'updateIso',
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 5d188e297b2..7fd1e8f269d 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -18,7 +18,7 @@ export default {
       }],
       tabs: [{
         name: 'details',
-        component: () => import('@/views/common/DetailsTab.vue')
+        component: () => import('@/components/view/DetailsTab.vue')
       }, {
         name: 'egress-rules',
         component: () => import('@/views/network/EgressConfigure.vue')
@@ -68,7 +68,7 @@ export default {
         component: () => import('@/views/network/VpcConfigure.vue')
       }, {
         name: 'details',
-        component: () => import('@/views/common/DetailsTab.vue')
+        component: () => import('@/components/view/DetailsTab.vue')
       }],
       actions: [
         {
@@ -111,7 +111,7 @@ export default {
       details: ['name', 'id', 'description', 'account', 'domain'],
       tabs: [{
         name: 'details',
-        component: () => import('@/views/common/DetailsTab.vue')
+        component: () => import('@/components/view/DetailsTab.vue')
       }, {
         name: 'ingress-rules',
         component: () => import('@/views/network/IngressRuleConfigure.vue')
@@ -153,7 +153,7 @@ export default {
         component: () => import('@/views/network/VpnDetails.vue')
       }, {
         name: 'details',
-        component: () => import('@/views/common/DetailsTab.vue')
+        component: () => import('@/components/view/DetailsTab.vue')
       }],
       actions: [
         {
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index a2e3c8d6062..3551728ef94 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -198,18 +198,17 @@
 import { api } from '@/api'
 import { mixinDevice } from '@/utils/mixin.js'
 import store from '@/store'
+
 import Breadcrumb from '@/components/widgets/Breadcrumb'
-import CardView from '@/components/widgets/CardView'
-import ChartCard from '@/components/chart/ChartCard'
-import ListView from '@/components/widgets/ListView'
-import ResourceView from '@/views/common/ResourceView'
 import Status from '@/components/widgets/Status'
+import ChartCard from '@/components/chart/ChartCard'
+import ListView from '@/components/view/ListView'
+import ResourceView from '@/components/view/ResourceView'
 
 export default {
   name: 'Resource',
   components: {
     Breadcrumb,
-    CardView,
     ChartCard,
     ResourceView,
     ListView,
diff --git a/ui/src/views/user/Login.vue b/ui/src/views/auth/Login.vue
similarity index 100%
rename from ui/src/views/user/Login.vue
rename to ui/src/views/auth/Login.vue
diff --git a/ui/src/views/compute/InstanceHardware.vue b/ui/src/views/compute/InstanceHardware.vue
index 8701795bbcf..b969d6b236e 100644
--- a/ui/src/views/compute/InstanceHardware.vue
+++ b/ui/src/views/compute/InstanceHardware.vue
@@ -84,16 +84,12 @@
 <script>
 
 import { api } from '@/api'
-import InfoCard from '@/views/common/InfoCard'
-import ListView from '@/components/widgets/ListView'
 import ResourceLayout from '@/layouts/ResourceLayout'
 import Status from '@/components/widgets/Status'
 
 export default {
   name: 'InstanceHardware',
   components: {
-    InfoCard,
-    ListView,
     ResourceLayout,
     Status
   },
diff --git a/ui/src/views/iam/Domain.vue b/ui/src/views/iam/Domain.vue
deleted file mode 100644
index 7a611b87077..00000000000
--- a/ui/src/views/iam/Domain.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: '',
-  components: {
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/ui/src/views/storage/UploadLocalIso.vue b/ui/src/views/image/UploadLocalIso.vue
similarity index 100%
rename from ui/src/views/storage/UploadLocalIso.vue
rename to ui/src/views/image/UploadLocalIso.vue
diff --git a/ui/src/views/storage/UploadLocalTemplate.vue b/ui/src/views/image/UploadLocalTemplate.vue
similarity index 100%
rename from ui/src/views/storage/UploadLocalTemplate.vue
rename to ui/src/views/image/UploadLocalTemplate.vue
diff --git a/ui/src/views/images/Template.vue b/ui/src/views/images/Template.vue
deleted file mode 100644
index 7a611b87077..00000000000
--- a/ui/src/views/images/Template.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: '',
-  components: {
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/ui/src/views/projects/Project.vue b/ui/src/views/projects/Project.vue
deleted file mode 100644
index 7a611b87077..00000000000
--- a/ui/src/views/projects/Project.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: '',
-  components: {
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/ui/src/views/setting/GlobalSettings.vue b/ui/src/views/setting/GlobalSettings.vue
deleted file mode 100644
index 7a611b87077..00000000000
--- a/ui/src/views/setting/GlobalSettings.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: '',
-  components: {
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/ui/src/views/setting/ResourceSettingsTab.vue b/ui/src/views/setting/ResourceSettingsTab.vue
index 3ffe5a94500..515f2deacd8 100644
--- a/ui/src/views/setting/ResourceSettingsTab.vue
+++ b/ui/src/views/setting/ResourceSettingsTab.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import ListView from '@/components/widgets/ListView'
+import ListView from '@/components/view/ListView'
 
 export default {
   name: 'ResourceSettingsTab',