diff --git a/frontend/src/components/ShowDialog.vue b/frontend/src/components/ShowDialog.vue
index 50641db..5f6098e 100644
--- a/frontend/src/components/ShowDialog.vue
+++ b/frontend/src/components/ShowDialog.vue
@@ -13,7 +13,7 @@
         </q-card-section>
         <q-card-actions v-if="!disableBtn" align="right" class="text-primary">
           <q-btn flat label="確定" :loading="okBtnLoading" :v-close-popup="okBtnAutoClose" @click="CloseDialogue('OK')" />
-          <q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
+          <q-btn flat label="キャンセル" :disable="okBtnLoading" v-close-popup @click="CloseDialogue('Cancel')" />
         </q-card-actions>
       </q-card>
     </q-dialog>
diff --git a/frontend/src/components/main/domainTable.vue b/frontend/src/components/main/domainTable.vue
new file mode 100644
index 0000000..23bf91d
--- /dev/null
+++ b/frontend/src/components/main/domainTable.vue
@@ -0,0 +1,33 @@
+<template>
+  <q-table :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading" :pagination="pagination">
+
+    <template v-slot:top>
+      <q-btn color="primary" :disable="loading" label="新規" @click="addRow" />
+      <q-space />
+      <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+    </template>
+
+    <template v-slot:body-cell-name="p">
+      <q-td class="flex justify-between items-center" :props="p">
+        {{ p.row.name }}
+        <q-badge v-if="!p.row.domainActive" color="grey">未启用</q-badge>
+        <q-badge v-if="p.row.id == currendDomainId" color="primary">現在</q-badge>
+      </q-td>
+    </template>
+
+    <template v-slot:body-cell-actions="p">
+      <q-td :props="p">
+        <q-btn-group flat>
+          <q-btn flat color="primary" padding="xs" size="1em" icon="edit_note" @click="editRow(p.row)" />
+          <q-btn flat color="negative" padding="xs" size="1em" icon="delete_outline" @click="removeRow(p.row)" />
+        </q-btn-group>
+      </q-td>
+    </template>
+
+  </q-table>
+</template>
+
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index 08942f3..e4ba99c 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -6,23 +6,14 @@
       <q-breadcrumbs-el icon="assignment_ind" label="ドメイン適用" />
     </q-breadcrumbs>
   </div>
-    <q-table :loading="loading" grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns" row-key="name"
+
+    <q-table :loading="initLoading" grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns" row-key="name"
       :filter="userDomainTableFilter" virtual-scroll v-model:pagination="pagination">
+
       <template v-slot:top>
-
         <q-btn class="q-mx-none" color="primary" label="追加" @click="clickAddDomain()" />
-
         <q-space />
         <div class="row q-gutter-md">
-          <!-- <q-item v-if="authStore.permissions === 'admin'" tag="label" dense @click="clickSwitchUser()">
-            <q-item-section>
-              <q-item-label>適用するユーザ : </q-item-label>
-            </q-item-section>
-            <q-item-section avatar>
-              {{ currentUserName }}
-            </q-item-section>
-          </q-item> -->
-
           <q-input borderless dense filled debounce="300" v-model="userDomainTableFilter" placeholder="Search">
             <template v-slot:append>
               <q-icon name="search" />
@@ -38,69 +29,47 @@
 
       <template v-slot:item="props">
         <div class="q-pa-sm">
-          <q-card>
+          <q-card :class="['domain-card', isNotOwner(props.row.id) ? 'bg-grey-2': '']">
             <q-card-section>
-              <div class="q-table__grid-item-row">
-                <div class="q-table__grid-item-title">Domain</div>
-                <div class="q-table__grid-item-value">{{ props.row.name }}</div>
+              <div class="row items-center no-wrap">
+                <div class="col">
+                  <div class="text-h6">{{ props.row.name }}</div>
+                  <div class="text-subtitle2">{{ props.row.url }}</div>
+                </div>
+                <div v-if="isNotOwner(props.row.id)" class="col-auto">
+                  <q-icon name="account_circle" color="teal" size="2em" ></q-icon>
+                </div>
               </div>
-              <div class="q-table__grid-item-row">
-                <div class="q-table__grid-item-title">URL</div>
-                <div class="q-table__grid-item-value" style="width: 22rem;">{{ props.row.url }}</div>
-              </div>
-              <div class="q-table__grid-item-row">
-                <div class="q-table__grid-item-title">Account</div>
-                <div class="q-table__grid-item-value">{{ props.row.kintoneuser }}</div>
+            </q-card-section>
+            <q-card-section>
+              <div class="row items-center no-wrap">
+                <div class="col">
+                  <div class="text-grey-7 text-caption text-weight-medium">アカウント</div>
+                  <div class="smaller-font-size">{{ props.row.kintoneuser }}</div>
+                </div>
+                <div v-if="isNotOwner(props.row.id)" class="col-auto">
+                  <div class="text-grey-7 text-caption text-weight-medium">所有者</div>
+                  <div class="smaller-font-size">{{ props.row.owner }}</div>
+                </div>
               </div>
             </q-card-section>
             <q-separator />
             <q-card-actions align="right">
-              <div style="width: 98%;">
-                <div class="row items-center justify-between">
-                  <div class="q-table__grid-item-value"
-                    :class="isActive(props.row.id) ? 'text-positive' : 'text-negative'">{{
-                      isActive(props.row.id)?'既定':'' }}</div>
-                  <div class="col-auto">
-                    <q-btn v-if="!isActive(props.row.id)" flat
-                      @click="activeDomain(props.row)">既定にする</q-btn>
-                    <q-btn flat @click="clickDeleteConfirm(props.row)">削除</q-btn>
-                  </div>
-                </div>
-              </div>
+              <q-chip v-if="isActive(props.row.id)" outline color="teal" text-color="white" icon="done">
+                既定
+              </q-chip>
+              <q-btn flat v-else :loading="activeDomainLoadingId === props.row.id" :disable="deleteDomainLoadingId === props.row.id" @click="activeDomain(props.row)">既定にする</q-btn>
+              <q-btn flat :disable="isNotOwner(props.row.id) || activeDomainLoadingId === props.row.id" :text-color="isNotOwner(props.row.id)?'grey':''" :loading="deleteDomainLoadingId === props.row.id" @click="clickDeleteConfirm(props.row)">削除</q-btn>
             </q-card-actions>
           </q-card>
         </div>
       </template>
     </q-table>
 
-    <show-dialog v-model:visible="showAddDomainDg" name="ドメイン" @close="addUserDomainFinished">
+    <show-dialog v-model:visible="showAddDomainDg" name="ドメイン" @close="addUserDomainFinished" :ok-btn-loading="addUserDomainLoading" :ok-btn-auto-close="false">
       <domain-select ref="addDomainRef" name="ドメイン" type="single" :filterInitRowsFunc="filterAddDgInitRows"></domain-select>
     </show-dialog>
 
-    <show-dialog v-model:visible="showSwitchUserDd" name="ドメイン" minWidth="35vw" @close="switchUserFinished">
-      <template v-slot:toolbar>
-        <q-input dense placeholder="検索" v-model="switchUserFilter">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <div class="q-gutter-md">
-        <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
-          <q-item-section>
-            <q-item-label>他のユーザーを選択する</q-item-label>
-          </q-item-section>
-          <q-item-section avatar>
-            <q-toggle v-model="useOtherUser" />
-          </q-item-section>
-        </q-item>
-        <div v-if="useOtherUser">
-          <user-list ref="switchUserRef" name="ドメイン" :filter="switchUserFilter" />
-        </div>
-      </div>
-
-    </show-dialog>
-
     <q-dialog v-model="showDeleteConfirm" persistent>
       <q-card>
         <q-card-section class="row items-center">
@@ -123,32 +92,27 @@
 import { ref, onMounted, computed } from 'vue'
 import { api } from 'boot/axios';
 import { useAuthStore } from 'stores/useAuthStore';
-import { useDomainStore } from 'stores/useDomainStore';
 
 import ShowDialog from 'components/ShowDialog.vue';
 import DomainSelect from 'components/DomainSelect.vue';
-import UserList from 'components/UserList.vue';
 
 const authStore = useAuthStore();
-const domainStore = useDomainStore();
 const pagination = ref({ sortBy: 'id', rowsPerPage: 0 });
 const rows = ref([] as any[]);
 const rowIds = new Set<string>();
-const loading = ref(true);
+const initLoading = ref(true);
+const addUserDomainLoading = ref(false);
+const activeDomainLoadingId = ref<number|undefined>(undefined);
+const deleteDomainLoadingId = ref<number|undefined>(undefined);
 
 const columns = [
   { name: 'id' },
   { name: 'name', required: true, label: 'Name', align: 'left', field: 'name', sortable: true },
   { name: 'url', align: 'center', label: 'Domain', field: 'url', sortable: true },
   { name: 'kintoneuser', label: 'User', field: 'kintoneuser', sortable: true },
-  { name: 'kintonepwd' },
 ];
 const userDomainTableFilter = ref();
 
-const currentUserName = ref('');
-const useOtherUser = ref(false);
-const otherUserId = ref('');
-
 let editId = ref(0);
 
 const showAddDomainDg = ref(false);
@@ -163,21 +127,23 @@ const clickAddDomain = () => {
   showAddDomainDg.value = true;
 };
 
-const addUserDomainFinished = (val: string) => {
+const addUserDomainFinished = async (val: string) => {
+  showAddDomainDg.value = true;
+  addUserDomainLoading.value = true;
   const selected = addDomainRef.value.selected;
   if (val == 'OK' && selected.length > 0) {
-    api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}?domainid=${selected[0].id}`)
-      .then(async ({ data }) => {
-        if (rows.value.length === 0 && data.data) {
-          const domain = data.data;
-          await authStore.setCurrentDomain({
-            id: domain.id,
-            kintoneUrl: domain.url,
-            domainName: domain.name
-          });
-        }
-        getDomain(useOtherUser.value ? otherUserId.value : undefined);
+    const { data } = await api.post(`api/domain/${authStore.userId}?domainid=${selected[0].id}`)
+    if (rows.value.length === 0 && data.data) {
+      const domain = data.data;
+      await authStore.setCurrentDomain({
+        id: domain.id,
+        kintoneUrl: domain.url,
+        domainName: domain.name
       });
+    }
+    await getDomain();
+    addUserDomainLoading.value = false;
+    showAddDomainDg.value = false;
   }
 };
 
@@ -189,26 +155,25 @@ const clickDeleteConfirm = (row: any) => {
 };
 
 const deleteDomainFinished = async () => {
-  await api.delete(`api/domain/${editId.value}/${useOtherUser.value ? otherUserId.value : authStore.userId}`).then(({ data }) => {
-    if (data.msg == 'OK' && authStore.currentDomain.id === editId.value) {
-      authStore.setCurrentDomain();
-    }
-    getDomain(useOtherUser.value ? otherUserId.value : undefined);
-  })
+  deleteDomainLoadingId.value = editId.value;
+  const { data } = await api.delete(`api/domain/${editId.value}/${authStore.userId}`)
+  if (data.msg == 'OK' && authStore.currentDomain.id === editId.value) {
+    authStore.setCurrentDomain();
+  }
   editId.value = 0;
+  await getDomain();
+  deleteDomainLoadingId.value = undefined;
 };
 
 const activeDomain = async (domain: any) => {
-  if (useOtherUser.value) {
-    // TODO
-    return;
-  }
+  activeDomainLoadingId.value = domain.id;
   await authStore.setCurrentDomain({
     id: domain.id,
     kintoneUrl: domain.url,
     domainName: domain.name
   });
-  getDomain();
+  await getDomain();
+  activeDomainLoadingId.value = undefined;
 };
 
 let activeDomainId = ref(0);
@@ -217,52 +182,43 @@ const isActive = computed(() => (id: number) => {
   return id == activeDomainId.value;
 });
 
-
-const showSwitchUserDd = ref(false);
-const switchUserRef = ref();
-const switchUserFilter = ref('')
-
-const clickSwitchUser = () => {
-  showSwitchUserDd.value = true;
-  useOtherUser.value = false;
-};
-
-const switchUserFinished = async (val: string) => {
-  if (val == 'OK') {
-    if (useOtherUser.value) {
-      const user = switchUserRef.value.selected[0]
-      currentUserName.value = user.email;
-      otherUserId.value = user.id
-      await getDomain(user.id)
-    } else {
-      currentUserName.value = authStore.userInfo.email
-      await getDomain();
-    }
-
-  }
-};
+const isNotOwner = computed(() => (ownerId: string) => {
+  return ownerId == authStore.userId;
+});
 
 const getDomain = async (userId? : string) => {
-  loading.value = true;
   rowIds.clear();
-  if (useOtherUser.value) {
-    // TODO
-    return;
-  }
   const resp = await api.get(`api/defaultdomain`);
   activeDomainId.value = resp?.data?.data?.id;
   const domainResult = userId ? await api.get(`api/domain?userId=${userId}`) : await api.get(`api/domain`);
   const domains = domainResult.data as any[];
   rows.value = domains.map((item) => {
     rowIds.add(item.id);
-    return { id: item.id, name: item.name, url: item.url, kintoneuser: item.kintoneuser, kintonepwd: item.kintonepwd }
+    return {
+      id: item.id,
+      name: item.name,
+      url: item.url,
+      kintoneuser: item.kintoneuser,
+      ownerEmail: item.owner.email,
+      owner: item.owner.first_name + ' ' + item.owner.last_name,
+    }
   });
-  loading.value = false;
 }
 
 onMounted(async () => {
-  currentUserName.value = authStore.userInfo.email
+  initLoading.value = true;
   await getDomain();
+  initLoading.value = false;
 })
 
 </script>
+<style lang="scss" scoped>
+.domain-card {
+  width: 22rem;
+  word-break: break-word;
+
+  .smaller-font-size {
+    font-size: 13px;
+  }
+}
+</style>
\ No newline at end of file