diff --git a/package.json b/package.json
index 85e0cd72b..d008e6e74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.32.01",
+    "version": "23.34.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/boot/axios.js b/src/boot/axios.js
index f8f27278c..bdc661ae2 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -64,7 +64,7 @@ const onResponseError = (error) => {
         const url = hash.slice(1);
         Router.push({ path: url });
     } else if (!session.isLoggedIn()) {
-        message = 'login.loginError';
+        return Promise.reject(error);
     }
 
     Notify.create({
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 8839bd030..2eac97c65 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -31,7 +31,7 @@ function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
         for (const child of item.children) {
-            if (search.indexOf(child.name) > -1) {
+            if (search?.indexOf(child.name) > -1) {
                 matches.push(child);
             } else if (child.children) {
                 findRoute(search, child);
@@ -55,10 +55,6 @@ function addChildren(module, route, parent) {
     }
 }
 
-const pinnedItems = computed(() => {
-    return items.value.filter((item) => item.isPinned);
-});
-
 const items = ref([]);
 function getRoutes() {
     if (props.source === 'main') {
@@ -115,48 +111,65 @@ async function togglePinned(item, event) {
 </script>
 
 <template>
-    <QList padding>
+    <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <QItemLabel header>
-                {{ t('globals.pinnedModules') }}
-            </QItemLabel>
-            <template v-for="item in pinnedItems" :key="item.name">
-                <template v-if="item.children">
-                    <LeftMenuItemGroup :item="item" group="pinnedModules" class="pinned">
-                        <template #side>
-                            <QBtn
-                                v-if="item.isPinned === true"
-                                @click="togglePinned(item, $event)"
-                                icon="remove_circle"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>{{
-                                    t('components.leftMenu.removeFromPinned')
-                                }}</QTooltip>
-                            </QBtn>
-                            <QBtn
-                                v-if="item.isPinned === false"
-                                @click="togglePinned(item, $event)"
-                                icon="push_pin"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>{{
-                                    t('components.leftMenu.addToPinned')
-                                }}</QTooltip>
-                            </QBtn>
-                        </template>
-                    </LeftMenuItemGroup>
-                </template>
-
-                <LeftMenuItem v-if="!item.children" :item="item" />
-            </template>
-            <QSeparator />
-            <QExpansionItem :label="t('moduleIndex.allModules')">
+            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
+                <QItem class="header">
+                    <QItemSection avatar>
+                        <QIcon name="view_module" />
+                    </QItemSection>
+                    <QItemSection> {{ t('globals.modules') }}</QItemSection>
+                </QItem>
+                <QSeparator />
                 <template v-for="item in items" :key="item.name">
+                    <template v-if="item.children">
+                        <LeftMenuItem :item="item" group="modules">
+                            <template #side>
+                                <QBtn
+                                    v-if="item.isPinned === true"
+                                    @click="togglePinned(item, $event)"
+                                    icon="remove_circle"
+                                    size="xs"
+                                    flat
+                                    round
+                                >
+                                    <QTooltip>
+                                        {{ t('components.leftMenu.removeFromPinned') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn
+                                    v-if="item.isPinned === false"
+                                    @click="togglePinned(item, $event)"
+                                    icon="push_pin"
+                                    size="xs"
+                                    flat
+                                    round
+                                >
+                                    <QTooltip>
+                                        {{ t('components.leftMenu.addToPinned') }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </LeftMenuItem>
+                    </template>
+                </template>
+            </template>
+
+            <template v-for="item in items" :key="item.name">
+                <template v-if="item.name === $route?.matched[1]?.name">
+                    <QItem class="header">
+                        <QItemSection avatar v-if="item.icon">
+                            <QIcon :name="item.icon" />
+                        </QItemSection>
+                        <QItemSection avatar v-if="!item.icon">
+                            <QIcon name="disabled_by_default" />
+                        </QItemSection>
+                        <QItemSection>{{ t(item.title) }}</QItemSection>
+                        <QItemSection side>
+                            <slot name="side" :item="item" />
+                        </QItemSection>
+                    </QItem>
+                    <QSeparator />
                     <template v-if="item.children">
                         <LeftMenuItemGroup :item="item" group="modules">
                             <template #side>
@@ -188,8 +201,7 @@ async function togglePinned(item, event) {
                         </LeftMenuItemGroup>
                     </template>
                 </template>
-            </QExpansionItem>
-            <QSeparator />
+            </template>
         </template>
         <template v-if="$props.source === 'card'">
             <template v-for="item in items" :key="item.name">
@@ -199,7 +211,7 @@ async function togglePinned(item, event) {
     </QList>
 </template>
 
-<style>
+<style scoped>
 .pinned .q-btn {
     visibility: hidden;
 }
@@ -207,4 +219,10 @@ async function togglePinned(item, event) {
 .pinned:hover .q-btn {
     visibility: visible;
 }
+.column-max-width {
+    max-width: 256px;
+}
+.header {
+    color: #999999;
+}
 </style>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index c889ac619..976136394 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -22,5 +22,8 @@ const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
             <QIcon name="disabled_by_default" />
         </QItemSection>
         <QItemSection>{{ t(item.title) }}</QItemSection>
+        <QItemSection side>
+            <slot name="side" :item="item" />
+        </QItemSection>
     </QItem>
 </template>
diff --git a/src/components/LeftMenuItemGroup.vue b/src/components/LeftMenuItemGroup.vue
index 06850b9d3..1fdb41e7c 100644
--- a/src/components/LeftMenuItemGroup.vue
+++ b/src/components/LeftMenuItemGroup.vue
@@ -1,12 +1,7 @@
 <script setup>
 import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import LeftMenuItem from './LeftMenuItem.vue';
 
-const route = useRoute();
-const { t } = useI18n();
-
 const props = defineProps({
     item: {
         type: Object,
@@ -19,33 +14,9 @@ const props = defineProps({
 });
 
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
-const isOpened = computed(() => {
-    const { matched } = route;
-    const { name } = item.value;
-
-    return matched.some((item) => item.name === name);
-});
 </script>
 <template>
-    <QExpansionItem
-        :group="props.group"
-        active-class="text-primary"
-        :label="item.title"
-        :to="{ name: item.name }"
-        expand-separator
-        :default-opened="isOpened"
-    >
-        <template #header>
-            <QItemSection avatar>
-                <QIcon :name="item.icon"></QIcon>
-            </QItemSection>
-            <QItemSection>{{ t(item.title) }}</QItemSection>
-            <QItemSection side>
-                <slot name="side" :item="item" />
-            </QItemSection>
-        </template>
-        <template v-for="section in item.children" :key="section.name">
-            <LeftMenuItem :item="section" />
-        </template>
-    </QExpansionItem>
+    <template v-for="section in item.children" :key="section.name">
+        <LeftMenuItem :item="section" />
+    </template>
 </template>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 7b7b1097f..79189b3f1 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,21 +1,25 @@
 <script setup>
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
-import UserPanel from 'components/UserPanel.vue';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
+import UserPanel from 'components/UserPanel.vue';
 
 const { t } = useI18n();
 const session = useSession();
 const stateStore = useStateStore();
+const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
+
+const pinnedModulesRef = ref();
 </script>
 
 <template>
@@ -56,11 +60,21 @@ onMounted(() => stateStore.setMounted());
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
+                <QBtn
+                    flat
+                    v-if="!quasar.platform.is.mobile"
+                    @click="pinnedModulesRef.redirect($route.params.id)"
+                    icon="more_up"
+                >
+                    <QTooltip>
+                        {{ t('Go to Salix') }}
+                    </QTooltip>
+                </QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}
                     </QTooltip>
-                    <PinnedModules />
+                    <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
                 <QBtn rounded dense flat no-wrap id="user">
                     <QAvatar size="lg">
@@ -80,3 +94,10 @@ onMounted(() => stateStore.setMounted());
         </QToolbar>
     </QHeader>
 </template>
+
+<i18n>
+en:
+    Go to Salix: Go to Salix
+es:
+    Go to Salix: Ir a Salix
+</i18n>
diff --git a/src/components/PinnedModules.vue b/src/components/PinnedModules.vue
index 2df7db390..c85b6b2fa 100644
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@@ -2,69 +2,91 @@
 import { onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
+import { getUrl } from 'src/composables/getUrl';
+import { useRoute } from 'vue-router';
 
 const navigation = useNavigationStore();
 const { t } = useI18n();
+const route = useRoute();
 
 onMounted(() => {
     navigation.fetchPinned();
 });
 
+defineExpose({
+    redirect,
+});
+
 const pinnedModules = computed(() => navigation.getPinnedModules());
+
+async function redirect() {
+    if (route.path == '/dashboard') return (window.location.href = await getUrl(''));
+    let section = route.path.substring(1);
+    section = section.substring(0, section.indexOf('/'));
+
+    if (route?.params?.id)
+        return (window.location.href = await getUrl(
+            `${section}/${route.params.id}/summary`
+        ));
+    return (window.location.href = await getUrl(section + '/index'));
+}
 </script>
 
 <template>
-    <QMenu
-        anchor="bottom left"
-        class="row q-pa-md q-col-gutter-lg"
-        max-width="350px"
-        max-height="400px"
-    >
-        <template v-if="pinnedModules.length">
-            <div
-                v-for="item of pinnedModules"
-                :key="item.title"
-                class="row no-wrap q-pa-xs flex-item"
+    <QMenu anchor="bottom left" max-width="300px" max-height="400px">
+        <div v-if="pinnedModules.length >= 0" class="row justify-around q-pa-md">
+            <QBtn
+                flat
+                stack
+                size="lg"
+                icon="more_up"
+                class="col-5"
+                @click="redirect($route.params.id)"
             >
+                <div class="text-center button-text">Salix</div>
+            </QBtn>
+            <QBtn flat stack size="lg" icon="home" class="col-5" to="/">
+                <div class="text-center button-text">{{ t('Home') }}</div>
+            </QBtn>
+            <div class="row col-12 justify-around q-mt-md">
                 <QBtn
-                    align="evenly"
-                    padding="16px"
                     flat
                     stack
                     size="lg"
                     :icon="item.icon"
                     color="primary"
-                    class="col-4 button"
+                    class="col-5"
                     :to="{ name: item.name }"
+                    v-for="item of pinnedModules"
+                    :key="item.title"
                 >
                     <div class="text-center text-primary button-text">
                         {{ t(item.title) }}
                     </div>
                 </QBtn>
             </div>
-        </template>
-        <template v-else>
+        </div>
+        <div v-else>
             <div
                 class="row no-wrap q-pa-xs flex-item text-center text-grey-5"
                 style="min-width: 200px"
             >
                 {{ t('globals.noPinnedModules') }}
             </div>
-        </template>
+        </div>
     </QMenu>
 </template>
 
 <style lang="scss" scoped>
-.flex-item {
-    width: 100px;
-}
-.button {
-    width: 100%;
-    line-height: normal;
-    align-items: center;
-}
 .button-text {
     font-size: 10px;
     margin-top: 5px;
 }
 </style>
+
+<i18n>
+en:
+    Home: Home
+es:
+    Home: Inicio
+</i18n>
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 54123d087..65a89ee28 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 
-const props = defineProps({
+const $props = defineProps({
     url: {
         type: String,
         default: '',
@@ -17,6 +17,14 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: 0,
+    },
 });
 
 const slots = useSlots();
@@ -30,15 +38,15 @@ const entity = ref();
 async function fetch() {
     const params = {};
 
-    if (props.filter) params.filter = JSON.stringify(props.filter);
+    if ($props.filter) params.filter = JSON.stringify($props.filter);
 
-    const { data } = await axios.get(props.url, { params });
+    const { data } = await axios.get($props.url, { params });
     entity.value = data;
 
     emit('onFetch', data);
 }
 
-watch(props, async () => {
+watch($props, async () => {
     entity.value = null;
     await fetch();
 });
@@ -49,14 +57,30 @@ watch(props, async () => {
         <template v-if="entity">
             <div class="header bg-primary q-pa-sm">
                 <RouterLink :to="{ name: `${module}List` }">
-                    <QBtn round flat dense size="md" icon="view_list" color="white">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="view_list"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.mainList') }}
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
                 <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
-                    <QBtn round flat dense size="md" icon="launch" color="white">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="launch"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.summary') }}
                         </QTooltip>
@@ -86,20 +110,32 @@ watch(props, async () => {
             <div class="body q-py-sm">
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <slot name="description" :entity="entity">
-                            <span>
-                                {{ entity.name }}
-                                <QTooltip>{{ entity.name }}</QTooltip>
+                        <div class="title">
+                            <span v-if="$props.title" :title="$props.title">
+                                {{ $props.title }}
                             </span>
-                        </slot>
+                            <slot v-else name="description" :entity="entity">
+                                <span :title="entity.name">
+                                    {{ entity.name }}
+                                </span>
+                            </slot>
+                        </div>
                     </QItemLabel>
                     <QItem dense>
-                        <QItemLabel class="text-subtitle2" caption>
-                            #{{ entity.id }}
+                        <QItemLabel class="subtitle" caption>
+                            #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
-                <slot name="body" :entity="entity" />
+                <div class="list-box q-mt-xs">
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions">
+                <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
         </template>
@@ -110,24 +146,82 @@ watch(props, async () => {
 
 <style lang="scss">
 .body {
-    .q-card__actions {
-        justify-content: center;
-    }
     .text-h5 {
         padding-top: 5px;
         padding-bottom: 5px;
     }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 5px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 2px 16px;
+        .label {
+            color: var(--vn-label);
+            font-size: 12px;
+            width: 47%;
+        }
+        .value {
+            color: var(--vn-text);
+            font-size: 14px;
+            margin-left: 12px;
+            width: 47%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
 }
 </style>
 
 <style lang="scss" scoped>
+.title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    span {
+        color: $primary;
+        font-weight: bold;
+    }
+}
+.subtitle {
+    color: var(--vn-text);
+    font-size: 16px;
+    margin-bottom: 15px;
+}
+.list-box {
+    width: 90%;
+    background-color: var(--vn-gray);
+    margin: 10px auto;
+    padding: 10px 5px 10px 0px;
+    border-radius: 8px;
+    .q-item__label {
+        color: var(--vn-label);
+    }
+}
 .descriptor {
     width: 256px;
-
     .header {
         display: flex;
         justify-content: space-between;
         align-items: stretch;
     }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+    }
 }
 </style>
diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
new file mode 100644
index 000000000..ed1df7668
--- /dev/null
+++ b/src/components/ui/CardList.vue
@@ -0,0 +1,83 @@
+<script setup>
+const $props = defineProps({
+    id: { type: Number, default: null },
+    title: { type: String, default: null },
+});
+</script>
+<template>
+    <QCard class="card q-mb-md cursor-pointer q-hoverable bg-white-7 q-pa-lg">
+        <div>
+            <slot name="title">
+                <div class="title text-primary text-weight-bold text-h5">
+                    {{ $props.title ?? `#${$props.id}` }}
+                </div>
+            </slot>
+            <div class="card-list-body row">
+                <div class="list-items row flex-wrap-wrap q-mt-md">
+                    <slot name="list-items" />
+                </div>
+
+                <div class="actions column justify-center">
+                    <slot name="actions" />
+                </div>
+            </div>
+        </div>
+    </QCard>
+</template>
+<style lang="scss">
+.card-list-body {
+    .vn-label-value {
+        display: flex;
+        justify-content: flex-start;
+        gap: 2%;
+        width: 50%;
+        .label {
+            width: 30%;
+            color: var(--vn-label);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .value {
+            width: 60%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+    .actions {
+        .q-btn {
+            width: 30px;
+        }
+        .q-icon {
+            color: $primary;
+            font-size: 25px;
+        }
+    }
+}
+
+@media (max-width: $breakpoint-xs) {
+    .card-list-body {
+        .vn-label-value {
+            width: 100%;
+        }
+    }
+}
+</style>
+
+<style lang="scss" scoped>
+.card {
+    transition: background-color 0.2s;
+}
+.card:hover {
+    background-color: var(--vn-gray);
+}
+.list-items {
+    width: 90%;
+}
+@media (max-width: $breakpoint-xs) {
+    .list-items {
+        width: 85%;
+    }
+}
+</style>
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index b3fb9746b..b54e44398 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -2,6 +2,8 @@
 import { onMounted, ref, watch } from 'vue';
 import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
 onMounted(() => fetch());
 
 const entity = ref();
@@ -41,15 +43,21 @@ watch(props, async () => {
 
 <template>
     <div class="summary container">
-        <QCard>
+        <QCard class="cardSummary">
             <SkeletonSummary v-if="!entity" />
             <template v-if="entity">
-                <div class="header bg-primary q-pa-sm q-mb-md">
+                <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
+                    <slot name="header-left">
+                        <span></span>
+                    </slot>
                     <slot name="header" :entity="entity">
-                        {{ entity.id }} - {{ entity.name }}
+                        <VnLv :label="`${entity.id} -`" :value="entity.name" />
+                    </slot>
+                    <slot name="header-right">
+                        <span></span>
                     </slot>
                 </div>
-                <div class="body q-pa-md q-mb-md">
+                <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />
                 </div>
             </template>
@@ -63,57 +71,87 @@ watch(props, async () => {
     justify-content: center;
 }
 
-.summary {
-    .q-card {
-        width: 100%;
-        max-width: 1200px;
-    }
-
-    .negative {
-        color: red;
-    }
-    .q-list {
-        .q-item__label--header {
-            display: flex;
-            justify-content: space-between;
-
-            a {
-                color: $primary;
-            }
-        }
-    }
-
-    .body > .q-card__section.row {
-        flex-wrap: wrap;
-
-        & > .col {
-            min-width: 250px;
-        }
-    }
-
-    .header {
+.cardSummary {
+    width: 100%;
+    .summaryHeader {
         text-align: center;
-        font-size: 18px;
+        font-size: 20px;
+        display: flex;
+        justify-content: space-between;
     }
+    .summaryBody {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-evenly;
+        gap: 15px;
+        padding: 15px;
 
-    #slider-container {
-        max-width: 80%;
-        margin: 0 auto;
+        > .q-card.vn-one {
+            flex: 1;
+        }
+        > .q-card.vn-two {
+            flex: 2;
+        }
+        > .q-card.vn-three {
+            flex: 3;
+        }
+        > .q-card.vn-max {
+            width: 100%;
+        }
 
-        .q-slider {
-            .q-slider__marker-labels:nth-child(1) {
-                transform: none;
+        > .q-card {
+            width: 100%;
+            background-color: var(--vn-gray);
+            padding: 15px;
+            font-size: 16px;
+            min-width: 275px;
+
+            .vn-label-value {
+                display: flex;
+                flex-direction: row;
+                margin-top: 5px;
+                .label {
+                    color: var(--vn-label);
+                    width: 10em;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    margin-right: 10px;
+                }
+                .value {
+                    color: var(--vn-text);
+                    width: max-content;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
             }
-            .q-slider__marker-labels:nth-child(2) {
-                transform: none;
-                left: auto !important;
-                right: 0%;
+            .header {
+                color: $primary;
+                font-weight: bold;
+                margin-bottom: 25px;
+                font-size: 20px;
+                display: inline-block;
+            }
+            .header.link:hover {
+                color: lighten($primary, 20%);
             }
         }
     }
-}
 
-.q-dialog .summary {
-    max-width: 1200px;
+    @media (max-width: $breakpoint-xs) {
+        .summaryBody {
+            padding: 0;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.summaryHeader .vn-label-value {
+    display: flex;
+    flex-direction: row;
+}
+.summaryHeader {
+    color: $white;
 }
 </style>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
new file mode 100644
index 000000000..0f9b99713
--- /dev/null
+++ b/src/components/ui/VnLv.vue
@@ -0,0 +1,44 @@
+<script setup>
+import { computed } from 'vue';
+import { dashIfEmpty } from 'src/filters';
+
+const $props = defineProps({
+    label: { type: String, default: null },
+    value: { type: [Number, String, Boolean], default: null },
+    titleLabel: { type: String, default: null },
+    titleValue: { type: [Number, String, Boolean], default: null },
+    info: { type: String, default: null },
+    dash: { type: Boolean, default: true },
+});
+const isBooleanValue = computed(() => typeof $props.value === 'boolean');
+</script>
+<template>
+    <div class="vn-label-value">
+        <div v-if="$props.label || $slots.label" class="label">
+            <slot name="label">
+                <span :title="$props.titleLabel ?? $props.label">{{ $props.label }}</span>
+            </slot>
+        </div>
+        <div class="value">
+            <span v-if="isBooleanValue">
+                <QIcon
+                    :name="$props.value ? `check` : `close`"
+                    :color="$props.value ? `positive` : `negative`"
+                    size="sm"
+                />
+            </span>
+            <slot v-else name="value">
+                <span :title="$props.value">
+                    {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
+                </span>
+            </slot>
+        </div>
+        <div class="info" v-if="$props.info">
+            <QIcon name="info">
+                <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
+                    {{ $props.info }}
+                </QTooltip>
+            </QIcon>
+        </div>
+    </div>
+</template>
diff --git a/src/composables/useCardDescription.js b/src/composables/useCardDescription.js
new file mode 100644
index 000000000..d064da0d7
--- /dev/null
+++ b/src/composables/useCardDescription.js
@@ -0,0 +1,8 @@
+export default function useCardDescription(title, subtitle) {
+    const getTitle = (title) => title;
+    const getSubtitle = (subtitle) => subtitle;
+    return {
+        title: getTitle(title),
+        subtitle: getSubtitle(subtitle),
+    };
+}
diff --git a/src/composables/useLogin.js b/src/composables/useLogin.js
new file mode 100644
index 000000000..c2c8153a2
--- /dev/null
+++ b/src/composables/useLogin.js
@@ -0,0 +1,30 @@
+import { ref, computed } from 'vue';
+
+const user = ref({});
+
+export function useLogin() {
+    function getUser() {
+        const userData = user.value;
+        user.value = {};
+        return computed(() => {
+            return {
+                user: userData.user,
+                password: userData.password,
+                keepLogin: userData.keepLogin,
+            };
+        });
+    }
+
+    function setUser(data) {
+        user.value = {
+            user: data.user,
+            password: data.password,
+            keepLogin: data.keepLogin,
+        };
+    }
+
+    return {
+        getUser,
+        setUser,
+    };
+}
diff --git a/src/css/app.scss b/src/css/app.scss
index 29e5bb600..3c8cc50b6 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -26,7 +26,16 @@ select:-webkit-autofill {
 
 body.body--light {
     .q-header .q-toolbar {
-        background-color: white;
+        background-color: $white;
         color: #555;
     }
+    --vn-text: #000000;
+    --vn-gray: #f5f5f5;
+    --vn-label: #5f5f5f;
+}
+
+body.body--dark {
+    --vn-text: #ffffff;
+    --vn-gray: #313131;
+    --vn-label: #a8a8a8;
 }
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 6ebf7a7a7..808bf3468 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -12,15 +12,33 @@
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
-$primary: #ff9800;
+$primary: #ec8916;
 $secondary: #26a69a;
 $accent: #9c27b0;
+$white: #fff;
 
 $positive: #21ba45;
 $negative: #c10015;
 $info: #31ccec;
 $warning: #f2c037;
 
+// Pendiente de cuadrar con la base de datos
+$success: $positive;
+$alert: $negative;
+
+.bg-success {
+    background-color: $positive;
+}
+.bg-notice {
+    background-color: $info;
+}
+.text-notice {
+    color: $info;
+}
+.bg-alert {
+    background-color: $negative;
+}
+
 $color-spacer-light: rgba(255, 255, 255, 0.12);
 $color-spacer: rgba(255, 255, 255, 0.3);
 $border-thin-light: 1px solid $color-spacer-light;
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 45114b33f..4cafee136 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -9,6 +9,7 @@ export default {
         backToDashboard: 'Return to dashboard',
         notifications: 'Notifications',
         userPanel: 'User panel',
+        modules: 'Modules',
         pinnedModules: 'Pinned modules',
         darkMode: 'Dark mode',
         logOut: 'Log out',
@@ -32,9 +33,9 @@ export default {
         rowRemoved: 'Row removed',
         pleaseWait: 'Please wait...',
         noPinnedModules: 'You have dont have any pinned modules',
-    },
-    moduleIndex: {
-        allModules: 'All modules',
+        summary: {
+            basicData: 'Basic data',
+        },
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -51,6 +52,20 @@ export default {
         loginSuccess: 'You have successfully logged in',
         loginError: 'Invalid username or password',
         fieldRequired: 'This field is required',
+        twoFactorRequired: 'Two-factor verification required',
+        pageTitles: {
+            logIn: 'Login',
+        },
+    },
+    twoFactor: {
+        code: 'Code',
+        validate: 'Validate',
+        insert: 'Enter the verification code',
+        explanation:
+            'Please, enter the verification code that we have sent to your email in the next 5 minutes',
+        pageTitles: {
+            twoFactor: 'Two-Factor',
+        },
     },
     dashboard: {
         pageTitles: {
@@ -142,6 +157,8 @@ export default {
             balanceDue: 'Balance due',
             balanceDueInfo: 'Deviated invoices minus payments',
             recoverySince: 'Recovery since',
+            businessType: 'Business Type',
+            city: 'City',
         },
         basicData: {
             socialName: 'Fiscal name',
@@ -163,6 +180,7 @@ export default {
             basicData: 'Basic Data',
             boxing: 'Boxing',
             sms: 'Sms',
+            notes: 'Notes',
         },
         list: {
             nickname: 'Nickname',
@@ -232,6 +250,7 @@ export default {
             requester: 'Requester',
             atender: 'Atender',
             request: 'Request',
+            weight: 'Weight',
             goTo: 'Go to',
         },
     },
@@ -270,6 +289,9 @@ export default {
             ticketId: 'Ticket ID',
             customerSummary: 'Customer summary',
             claimedTicket: 'Claimed ticket',
+            commercial: 'Commercial',
+            province: 'Province',
+            zone: 'Zone',
         },
         summary: {
             customer: 'Customer',
@@ -325,11 +347,14 @@ export default {
         list: {
             ref: 'Reference',
             issued: 'Issued',
+            shortIssued: 'Issued',
             amount: 'Amount',
             client: 'Client',
             created: 'Created',
+            shortCreated: 'Created',
             company: 'Company',
             dued: 'Due date',
+            shortDued: 'Due date',
         },
         card: {
             issued: 'Issued',
@@ -396,6 +421,7 @@ export default {
             userId: 'User ID',
             role: 'Role',
             sipExtension: 'Extension',
+            locker: 'Locker',
         },
         notificationsManager: {
             activeNotifications: 'Active notifications',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 21691f898..13e3fd626 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -9,6 +9,7 @@ export default {
         backToDashboard: 'Volver al tablón',
         notifications: 'Notificaciones',
         userPanel: 'Panel de usuario',
+        modules: 'Módulos',
         pinnedModules: 'Módulos fijados',
         darkMode: 'Modo oscuro',
         logOut: 'Cerrar sesión',
@@ -32,9 +33,9 @@ export default {
         rowRemoved: 'Fila eliminada',
         pleaseWait: 'Por favor, espera...',
         noPinnedModules: 'No has fijado ningún módulo',
-    },
-    moduleIndex: {
-        allModules: 'Todos los módulos',
+        summary: {
+            basicData: 'Datos básicos',
+        },
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -51,6 +52,20 @@ export default {
         loginSuccess: 'Inicio de sesión correcto',
         loginError: 'Nombre de usuario o contraseña incorrectos',
         fieldRequired: 'Este campo es obligatorio',
+        twoFactorRequired: 'Verificación de doble factor requerida',
+        pageTitles: {
+            logIn: 'Inicio de sesión',
+        },
+    },
+    twoFactor: {
+        code: 'Código',
+        validate: 'Validar',
+        insert: 'Introduce el código de verificación',
+        explanation:
+            'Por favor, introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos',
+        pageTitles: {
+            twoFactor: 'Doble factor',
+        },
     },
     dashboard: {
         pageTitles: {
@@ -107,7 +122,7 @@ export default {
             province: 'Provincia',
             country: 'País',
             street: 'Calle',
-            isEqualizated: 'Equalizado',
+            isEqualizated: 'Recargo de equivalencia',
             isActive: 'Activo',
             invoiceByAddress: 'Facturar por consignatario',
             verifiedData: 'Datos verificados',
@@ -141,6 +156,8 @@ export default {
             balanceDue: 'Saldo vencido',
             balanceDueInfo: 'Facturas fuera de plazo menos recibos',
             recoverySince: 'Recobro desde',
+            businessType: 'Tipo de negocio',
+            city: 'Población',
         },
         basicData: {
             socialName: 'Nombre fiscal',
@@ -162,6 +179,7 @@ export default {
             basicData: 'Datos básicos',
             boxing: 'Encajado',
             sms: 'Sms',
+            notes: 'Notas',
         },
         list: {
             nickname: 'Alias',
@@ -231,6 +249,7 @@ export default {
             requester: 'Solicitante',
             atender: 'Comprador',
             request: 'Petición de compra',
+            weight: 'Peso',
             goTo: 'Ir a',
         },
     },
@@ -269,6 +288,9 @@ export default {
             ticketId: 'ID ticket',
             customerSummary: 'Resumen del cliente',
             claimedTicket: 'Ticket reclamado',
+            commercial: 'Comercial',
+            province: 'Provincia',
+            zone: 'Zona',
         },
         summary: {
             customer: 'Cliente',
@@ -325,11 +347,14 @@ export default {
         list: {
             ref: 'Referencia',
             issued: 'Fecha emisión',
+            shortIssued: 'F. emisión',
             amount: 'Importe',
             client: 'Cliente',
             created: 'Fecha creación',
+            shortCreated: 'F. creación',
             company: 'Empresa',
             dued: 'Fecha vencimineto',
+            shortDued: 'F. vencimiento',
         },
         card: {
             issued: 'Fecha emisión',
@@ -396,6 +421,7 @@ export default {
             userId: 'ID del usuario',
             role: 'Rol',
             sipExtension: 'Extensión',
+            locker: 'Taquilla',
         },
         notificationsManager: {
             activeNotifications: 'Notificaciones activas',
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
new file mode 100644
index 000000000..6ea14622f
--- /dev/null
+++ b/src/layouts/OutLayout.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { Dark, Quasar } from 'quasar';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t, locale } = useI18n();
+
+const userLocale = computed({
+    get() {
+        return locale.value;
+    },
+    set(value) {
+        locale.value = value;
+
+        if (value === 'en') value = 'en-GB';
+
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
+        try {
+            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
+            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
+    },
+});
+const darkMode = computed({
+    get() {
+        return Dark.isActive;
+    },
+    set(value) {
+        Dark.set(value);
+    },
+});
+const langs = ['en', 'es'];
+</script>
+
+<template>
+    <QLayout view="hHh LpR fFf">
+        <QHeader reveal class="bg-dark">
+            <QToolbar class="justify-end">
+                <QBtn
+                    id="switchLanguage"
+                    :label="t('globals.language')"
+                    icon="translate"
+                    color="primary"
+                    size="sm"
+                    flat
+                    rounded
+                >
+                    <QMenu auto-close>
+                        <QList dense v-for="lang in langs" :key="lang">
+                            <QItem
+                                @click="userLocale = lang"
+                                :active="userLocale == lang"
+                                v-ripple
+                                clickable
+                            >
+                                {{ t(`globals.lang.${lang}`) }}
+                            </QItem>
+                        </QList>
+                    </QMenu>
+                </QBtn>
+                <QList>
+                    <QItem>
+                        <QItemSection>
+                            <QToggle
+                                v-model="darkMode"
+                                checked-icon="dark_mode"
+                                unchecked-icon="light_mode"
+                                :label="t(`globals.darkMode`)"
+                            />
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QToolbar>
+        </QHeader>
+        <QPageContainer>
+            <QPage>
+                <div class="form">
+                    <QCard class="q-pa-lg formCard">
+                        <RouterView></RouterView>
+                    </QCard>
+                </div>
+            </QPage>
+        </QPageContainer>
+    </QLayout>
+</template>
+
+<style lang="scss" scoped>
+.form {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: inherit;
+    flex-direction: column;
+}
+
+.formCard {
+    max-width: 350px;
+    min-width: 300px;
+}
+
+@media (max-width: $breakpoint-xs-max) {
+    .formCard {
+        min-width: 100%;
+    }
+}
+</style>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index baba66e2a..914de2eb2 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,12 +1,14 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
-
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -25,11 +27,29 @@ const entityId = computed(() => {
 
 const filter = {
     include: [
-        { relation: 'client' },
-        { relation: 'claimState' },
+        {
+            relation: 'client',
+            scope: {
+                include: { relation: 'salesPersonUser' },
+            },
+        },
         {
             relation: 'claimState',
         },
+        {
+            relation: 'ticket',
+            scope: {
+                include: [
+                    { relation: 'zone' },
+                    {
+                        relation: 'address',
+                        scope: {
+                            include: { relation: 'province' },
+                        },
+                    },
+                ],
+            },
+        },
         {
             relation: 'worker',
             scope: {
@@ -40,10 +60,14 @@ const filter = {
 };
 
 function stateColor(code) {
-    if (code === 'pending') return 'green';
-    if (code === 'managed') return 'orange';
-    if (code === 'resolved') return 'red';
+    if (code === 'pending') return 'positive';
+    if (code === 'managed') return 'warning';
+    if (code === 'resolved') return 'negative';
 }
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    data.value = useCardDescription(entity.client.name, entity.id);
+};
 </script>
 
 <template>
@@ -52,54 +76,58 @@ function stateColor(code) {
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('claim.card.created') }}</QItemLabel>
-                        <QItemLabel>{{ toDate(entity.created) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.claimState">
-                        <QItemLabel caption>{{ t('claim.card.state') }}</QItemLabel>
-                        <QItemLabel>
-                            <QBadge :color="stateColor(entity.claimState.code)" dense>
-                                {{ entity.claimState.description }}
-                            </QBadge>
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('claim.card.ticketId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.ticketFk }}
-
-                                <TicketDescriptorProxy :id="entity.ticketFk" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.worker">
-                        <QItemLabel caption>
-                            {{ t('claim.card.assignedTo') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.worker.user.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
+            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+                <template #value>
+                    <QBadge :color="stateColor(entity.claimState.code)" dense>
+                        {{ entity.claimState.description }}
+                    </QBadge>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.ticketId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.ticketFk }}
 
+                        <TicketDescriptorProxy :id="entity.ticketFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.worker"
+                :label="t('claim.card.assignedTo')"
+                :value="entity.worker.user.name"
+            >
+                <template #value>
+                    <span class="link">
+                        {{ entity.worker.user.name }}
+                        <WorkerDescriptorProxy :id="entity.worker.userFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.commercial')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.client.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                :label="t('claim.card.province')"
+                :value="entity.ticket.address.province.name"
+            />
+            <VnLv :label="t('claim.card.zone')" :value="entity.ticket.zone.name" />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -121,3 +149,8 @@ function stateColor(code) {
         </template>
     </CardDescriptor>
 </template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index ac464d125..dc5ec9544 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,12 +1,14 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
+import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
+import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -22,6 +24,14 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 
+const claimUrl = ref();
+const salixUrl = ref();
+
+onMounted(async () => {
+    salixUrl.value = await getUrl('');
+    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
+});
+
 const detailsColumns = ref([
     {
         name: 'item',
@@ -155,78 +165,52 @@ function openDialog(dmsId) {
         <template #header="{ entity: { claim } }">
             {{ claim.id }} - {{ claim.client.name }}
         </template>
-        <template #body="{ entity: { developments, observations, claim, salesClaimed } }">
-            <QCardSection class="row q-pa-none q-col-gutter-md">
-                <div class="col">
-                    <QList>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('claim.summary.created') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ toDate(claim.created) }}</QItemLabel>
-                            </QItemSection>
-                            <QItemSection v-if="claim.claimState">
-                                <QItemLabel caption>
-                                    {{ t('claim.summary.state') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    <QChip
-                                        :color="stateColor(claim.claimState.code)"
-                                        dense
-                                    >
-                                        {{ claim.claimState.description }}
-                                    </QChip>
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection v-if="claim.worker && claim.worker.user">
-                                <QItemLabel caption>
-                                    {{ t('claim.summary.assignedTo') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    <span class="link">
-                                        {{ claim.worker.user.nickname }}
-                                        <WorkerDescriptorProxy :id="claim.workerFk" />
-                                    </span>
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection
-                                v-if="claim.client && claim.client.salesPersonUser"
-                            >
-                                <QItemLabel caption>
-                                    {{ t('claim.summary.attendedBy') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    <span class="link">
-                                        {{ claim.client.salesPersonUser.name }}
-                                        <WorkerDescriptorProxy
-                                            :id="claim.client.salesPersonFk"
-                                        />
-                                    </span>
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-            </QCardSection>
-            <QCardSection class="q-pa-md" v-if="observations.length > 0">
-                <h6>{{ t('claim.summary.notes') }}</h6>
-                <div class="note-list" v-for="note in observations" :key="note.id">
-                    <div class="note-caption">
-                        <span
-                            >{{ note.worker.firstName }} {{ note.worker.lastName }}
+        <template #body="{ entity: { claim, salesClaimed, developments } }">
+            <QCard class="vn-one">
+                <a class="header" :href="`#/claim/${entityId}/basic-data`">
+                    {{ t('claim.pageTitles.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('claim.summary.created')"
+                    :value="toDate(claim.created)"
+                />
+                <VnLv :label="t('claim.summary.state')">
+                    <template #value>
+                        <QChip :color="stateColor(claim.claimState.code)" dense>
+                            {{ claim.claimState.description }}
+                        </QChip>
+                    </template>
+                </VnLv>
+                <VnLv :label="t('claim.summary.assignedTo')">
+                    <template #value>
+                        <span class="link">
+                            {{ claim.worker.user.nickname }}
+                            <WorkerDescriptorProxy :id="claim.workerFk" />
                         </span>
-                        <span>{{ toDate(note.created) }}</span>
-                    </div>
-                    <div class="note-text">
-                        <span>{{ note.text }}</span>
-                    </div>
-                </div>
-            </QCardSection>
-            <QCardSection class="q-pa-md" v-if="salesClaimed.length > 0">
-                <h6>{{ t('claim.summary.details') }}</h6>
+                    </template>
+                </VnLv>
+                <VnLv :label="t('claim.summary.attendedBy')">
+                    <template #value>
+                        <span class="link">
+                            {{ claim.client.salesPersonUser.name }}
+                            <WorkerDescriptorProxy :id="claim.client.salesPersonFk" />
+                        </span>
+                    </template>
+                </VnLv>
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header" :href="claimUrl + 'note/index'">
+                    {{ t('claim.summary.notes') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <!-- Use VnNotes and maybe VirtualScroll-->
+            </QCard>
+            <QCard class="vn-max" v-if="salesClaimed.length > 0">
+                <a class="header" :href="claimUrl + 'note/index'">
+                    {{ t('claim.summary.details') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
                 <QTable :columns="detailsColumns" :rows="salesClaimed" flat>
                     <template #header="props">
                         <QTr :props="props">
@@ -236,16 +220,19 @@ function openDialog(dmsId) {
                         </QTr>
                     </template>
                 </QTable>
-            </QCardSection>
-            <QCardSection class="q-pa-md" v-if="claimDms.length > 0">
-                <h6>{{ t('claim.summary.photos') }}</h6>
+            </QCard>
+            <QCard class="vn-max" v-if="claimDms.length > 0">
+                <a class="header" :href="`#/claim/${entityId}/photos`">
+                    {{ t('claim.summary.photos') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
                 <div class="container">
-                    <div class="multimediaParent bg-transparent">
-                        <div
-                            v-for="(media, index) of claimDms"
-                            :key="index"
-                            class="relative-position"
-                        >
+                    <div
+                        class="multimedia-container"
+                        v-for="(media, index) of claimDms"
+                        :key="index"
+                    >
+                        <div class="relative-position">
                             <QIcon
                                 name="play_circle"
                                 color="primary"
@@ -275,9 +262,12 @@ function openDialog(dmsId) {
                         </div>
                     </div>
                 </div>
-            </QCardSection>
-            <QCardSection class="q-pa-md" v-if="developments.length > 0">
-                <h6>{{ t('claim.summary.development') }}</h6>
+            </QCard>
+            <QCard class="vn-two" v-if="developments.length > 0">
+                <a class="header" :href="claimUrl + 'development'">
+                    {{ t('claim.summary.development') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
                 <QTable :columns="developmentColumns" :rows="developments" flat>
                     <template #header="props">
                         <QTr :props="props">
@@ -287,11 +277,13 @@ function openDialog(dmsId) {
                         </QTr>
                     </template>
                 </QTable>
-            </QCardSection>
-            <QCardSection class="q-pa-md">
-                <h6>{{ t('claim.summary.actions') }}</h6>
-                <QSeparator />
-                <div id="slider-container">
+            </QCard>
+            <QCard class="vn-max" v-if="developments.length > 0">
+                <a class="header" :href="claimUrl + 'action'">
+                    {{ t('claim.summary.actions') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"
                         label
@@ -308,7 +300,21 @@ function openDialog(dmsId) {
                         readonly
                     />
                 </div>
-            </QCardSection>
+            </QCard>
+            <!-- <QCardSection class="q-pa-md" v-if="observations.length > 0">
+                <h6>{{ t('claim.summary.notes') }}</h6>
+                <div class="note-list" v-for="note in observations" :key="note.id">
+                    <div class="note-caption">
+                        <span
+                            >{{ note.worker.firstName }} {{ note.worker.lastName }}
+                        </span>
+                        <span>{{ toDate(note.created) }}</span>
+                    </div>
+                    <div class="note-text">
+                        <span>{{ note.text }}</span>
+                    </div>
+                </div>
+            </QCardSection> -->
             <QDialog
                 v-model="multimediaDialog"
                 transition-show="slide-up"
@@ -352,22 +358,19 @@ function openDialog(dmsId) {
     </CardSummary>
 </template>
 <style lang="scss" scoped>
-.container {
-    min-width: 80%;
-}
 .q-dialog__inner--minimized > div {
     max-width: 80%;
 }
-
-.multimediaParent {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(500px, 1fr));
-
-    grid-auto-rows: auto;
-
-    grid-gap: 1rem;
+.container {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 15px;
+    flex-basis: 30%;
+}
+.multimedia-container {
+    flex: 1 0 21%;
 }
-
 .multimedia {
     transition: all 0.5s;
     opacity: 1;
@@ -395,18 +398,4 @@ function openDialog(dmsId) {
 .zindex {
     z-index: 1;
 }
-
-.note-list {
-    width: 100%;
-    border: 0.1rem solid $grey-7;
-    padding: 0.5rem;
-    margin-bottom: 0.5rem;
-}
-
-.note-caption {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-    color: $grey-7;
-}
 </style>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index f9afa7177..79afc7e91 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -9,6 +9,8 @@ import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -74,116 +76,62 @@ function viewSummary(id) {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QCard class="card q-mb-md" v-for="row of rows" :key="row.id">
-                        <QItem
-                            class="q-pa-none items-start cursor-pointer q-hoverable"
-                            v-ripple
-                            clickable
-                        >
-                            <QItemSection class="q-pa-md" @click="navigate(row.id)">
-                                <div class="text-h6 link">
-                                    {{ row.clientName }}
-                                </div>
-                                <QItemLabel caption>#{{ row.id }}</QItemLabel>
-                                <QList>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('claim.list.customer') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.clientName }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('claim.list.assignedTo') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.workerName }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('claim.list.created') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toDate(row.created) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('claim.list.state') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                <QBadge
-                                                    :color="stateColor(row.stateCode)"
-                                                    class="q-ma-none"
-                                                    dense
-                                                >
-                                                    {{ row.stateDescription }}
-                                                </QBadge>
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QItemSection>
-                            <QSeparator vertical />
-                            <QCardActions vertical class="justify-between">
-                                <!-- <QBtn color="grey-7" round flat icon="more_vert">
-                                <QTooltip>{{ t('customer.list.moreOptions') }}</QTooltip>
-                                <QMenu cover auto-close>
-                                    <QList>
-                                        <QItem clickable>
-                                            <QItemSection avatar>
-                                                <QIcon name="add" />
-                                            </QItemSection>
-                                            <QItemSection>Add a note</QItemSection>
-                                        </QItem>
-                                        <QItem clickable>
-                                            <QItemSection avatar>
-                                                <QIcon name="logs" />
-                                            </QItemSection>
-                                            <QItemSection>Display claim logs</QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QMenu>
-                            </QBtn> -->
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.clientName"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv label="ID" :value="row.id" />
+                            <VnLv
+                                :label="t('claim.list.customer')"
+                                :value="row.clientName"
+                            />
+                            <VnLv
+                                :label="t('claim.list.assignedTo')"
+                                :value="row.workerName"
+                            />
+                            <VnLv
+                                :label="t('claim.list.created')"
+                                :value="toDate(row.created)"
+                            />
+                            <VnLv :label="t('claim.list.state')">
+                                <template #value>
+                                    <QBadge
+                                        :color="stateColor(row.stateCode)"
+                                        class="q-ma-none"
+                                        dense
+                                    >
+                                        {{ row.stateDescription }}
+                                    </QBadge>
+                                </template>
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                flat
+                                icon="arrow_circle_right"
+                                @click.stop="navigate(row.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('components.smartCard.openCard') }}
+                                </QTooltip>
+                            </QBtn>
+                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
+                                <QTooltip>
+                                    {{ t('components.smartCard.openSummary') }}
+                                </QTooltip>
+                            </QBtn>
+                            <QBtn flat icon="vn:client" @click.stop>
+                                <QTooltip>
+                                    {{ t('components.smartCard.viewDescription') }}
+                                </QTooltip>
 
-                                <QBtn
-                                    flat
-                                    round
-                                    color="orange"
-                                    icon="arrow_circle_right"
-                                    @click="navigate(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openCard') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    color="grey-7"
-                                    icon="preview"
-                                    @click="viewSummary(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openSummary') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn flat round color="grey-7" icon="vn:client">
-                                    <QTooltip>
-                                        {{ t('components.smartCard.viewDescription') }}
-                                    </QTooltip>
-
-                                    <CustomerDescriptorProxy :id="row.clientFk" />
-                                </QBtn>
-                            </QCardActions>
-                        </QItem>
-                    </QCard>
+                                <CustomerDescriptorProxy :id="row.clientFk" />
+                            </QBtn>
+                        </template>
+                    </CardList>
                 </template>
             </VnPaginate>
         </div>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 8463e0390..23e6228ee 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -20,57 +22,38 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Customer" :url="`Clients/${entityId}/getCard`">
+    <CardDescriptor
+        module="Customer"
+        :url="`Clients/${entityId}/getCard`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #body="{ entity }">
-            <QList dense>
-                <QItem v-if="entity.salesPersonUser" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.salesPerson') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        <span class="link">
-                            {{ entity.salesPersonUser.name }}
-                            <WorkerDescriptorProxy :id="entity.salesPersonFk" />
-                        </span>
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.credit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.credit) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.securedCredit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.creditInsurance) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem v-if="entity.payMethod" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.payMethod') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ entity.payMethod.name }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.debt') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.debt) }}
-                    </QItemLabel>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
+            <VnLv
+                :label="t('customer.card.securedCredit')"
+                :value="toCurrency(entity.creditInsurance)"
+            />
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
+            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isActive == false"
                     name="vn:disabled"
@@ -103,15 +86,9 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="entity.account && entity.account.active == false"
-                    name="vn:noweb"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.noWebAccess') }}</QTooltip>
-                </QIcon>
             </QCardActions>
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     :to="{
@@ -135,23 +112,10 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('invoiceOutList') }}</QTooltip>
                 </QBtn>
-                <!-- 
-                <QBtn size="md" icon="vn:basketadd" color="primary">
-                    <QTooltip>Order list</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="face" color="primary">
-                    <QTooltip>View user</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="expand_more" color="primary">
-                    <QTooltip>More options</QTooltip>
-                </QBtn> -->
             </QCardActions>
         </template>
     </CardDescriptor>
 </template>
-
 <i18n>
 {
     "en": {
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 4eaf3d704..081bdd157 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -1,9 +1,11 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -16,8 +18,13 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
-const summary = ref();
 const customer = computed(() => summary.value.entity);
+const summary = ref();
+const clientUrl = ref();
+
+onMounted(async () => {
+    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
+});
 
 const balanceDue = computed(() => {
     return (
@@ -38,7 +45,7 @@ const priceIncreasingRate = computed(() => {
 });
 
 const debtWarning = computed(() => {
-    return customer.value.debt.debt > customer.value.credit ? 'negative' : '';
+    return customer.value?.debt?.debt > customer.value.credit ? 'negative' : '';
 });
 
 const creditWarning = computed(() => {
@@ -53,478 +60,212 @@ const creditWarning = computed(() => {
 <template>
     <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
         <template #body="{ entity }">
-            <QCardSection class="row q-pa-none QCol-gutter-md">
-                <div class="col">
-                    <QList dense>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.basicData') }}
-                            <RouterLink
-                                :to="{
-                                    name: 'CustomerBasicData',
-                                    params: { id: entity.id },
-                                }"
-                                target="_blank"
-                            >
-                                <QIcon name="open_in_new" />
-                            </RouterLink>
-                        </QItemLabel>
-                        <QSeparator class="q-mb-md" />
+            <QCard class="vn-one">
+                <a class="header" :href="clientUrl + `basic-data`">
+                    {{ t('customer.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
+                <VnLv :label="t('customer.summary.name')" :value="entity.name" />
+                <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
+                <VnLv :label="t('customer.summary.phone')" :value="entity.phone" />
+                <VnLv :label="t('customer.summary.mobile')" :value="entity.mobile" />
+                <VnLv :label="t('customer.summary.email')" :value="entity.email" />
+                <VnLv
+                    :label="t('customer.summary.salesPerson')"
+                    :value="entity?.salesPersonUser?.name"
+                />
+                <VnLv
+                    :label="t('customer.summary.contactChannel')"
+                    :value="entity?.contactChannel?.name"
+                />
+                <VnLv
+                    :label="t('customer.summary.businessType')"
+                    :value="entity.businessType.description"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header" :href="clientUrl + `fiscal-data`">
+                    {{ t('customer.summary.fiscalAddress') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.socialName')"
+                    :value="entity.socialName"
+                />
+                <VnLv :label="t('customer.summary.fiscalId')" :value="entity.fi" />
+                <VnLv :label="t('customer.summary.city')" :value="entity.city" />
+                <VnLv :label="t('customer.summary.postcode')" :value="entity.postcode" />
 
-                        <QItem class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.customerId') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.id }}
-                            </QItemLabel>
-                        </QItem>
-                        <QItem class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.name') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.name }}
-                            </QItemLabel>
-                        </QItem>
-                        <QItem class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.contact') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.contact }}
-                            </QItemLabel>
-                        </QItem>
+                <VnLv
+                    v-if="entity.province"
+                    :label="t('customer.summary.province')"
+                    :value="entity.province.name"
+                />
+                <VnLv
+                    v-if="entity.country"
+                    :label="t('customer.summary.country')"
+                    :value="entity.country.country"
+                />
+                <VnLv :label="t('customer.summary.street')" :value="entity.street" />
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="clientUrl + `fiscal-data`" link>
+                    {{ t('customer.summary.fiscalAddress') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.isEqualizated')"
+                    :value="entity.isEqualizated"
+                />
+                <VnLv :label="t('customer.summary.isActive')" :value="entity.isActive" />
+                <VnLv
+                    :label="t('customer.summary.invoiceByAddress')"
+                    :value="entity.hasToInvoiceByAddress"
+                />
+                <VnLv
+                    :label="t('customer.summary.verifiedData')"
+                    :value="entity.isTaxDataChecked"
+                />
+                <VnLv
+                    :label="t('customer.summary.hasToInvoice')"
+                    :value="entity.hasToInvoice"
+                />
+                <VnLv
+                    :label="t('customer.summary.notifyByEmail')"
+                    :value="entity.isToBeMailed"
+                />
+                <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="clientUrl + `billing-data`" link>
+                    {{ t('customer.summary.billingData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.payMethod')"
+                    :value="entity.payMethod.name"
+                />
+                <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
+                <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
+                <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
+                <VnLv
+                    :label="t('customer.summary.hasCoreVnl')"
+                    :value="entity.hasCoreVnl"
+                />
+                <VnLv
+                    :label="t('customer.summary.hasB2BVnl')"
+                    :value="entity.hasSepaVnl"
+                />
+            </QCard>
+            <QCard class="vn-one" v-if="entity.defaultAddress">
+                <a class="header link" :href="clientUrl + `address/index`" link>
+                    {{ t('customer.summary.consignee') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.addressName')"
+                    :value="entity.defaultAddress.nickname"
+                />
+                <VnLv
+                    :label="t('customer.summary.addressCity')"
+                    :value="entity.defaultAddress.city"
+                />
+                <VnLv
+                    :label="t('customer.summary.addressStreet')"
+                    :value="entity.defaultAddress.street"
+                />
+            </QCard>
+            <QCard class="vn-one" v-if="entity.account">
+                <a class="header link" :href="clientUrl + `web-access`">
+                    {{ t('customer.summary.webAccess') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.username')"
+                    :value="entity.account.name"
+                />
+                <VnLv
+                    :label="t('customer.summary.webAccess')"
+                    :value="entity.account.active"
+                />
+            </QCard>
+            <QCard class="vn-one" v-if="entity.account">
+                <div class="header">
+                    {{ t('customer.summary.businessData') }}
+                </div>
+                <VnLv
+                    :label="t('customer.summary.totalGreuge')"
+                    :value="toCurrency(entity.totalGreuge)"
+                />
+                <VnLv
+                    :label="t('customer.summary.mana')"
+                    :value="toCurrency(entity?.mana?.mana)"
+                />
+                <VnLv
+                    v-if="entity.claimsRatio"
+                    :label="t('customer.summary.priceIncreasingRate')"
+                    :value="toPercentage(priceIncreasingRate)"
+                />
+                <VnLv
+                    :label="t('customer.summary.averageInvoiced')"
+                    :value="toCurrency(entity?.averageInvoiced?.invoiced)"
+                />
+                <VnLv
+                    v-if="entity.claimsRatio"
+                    :label="t('customer.summary.claimRate')"
+                    :value="toPercentage(claimRate)"
+                />
+            </QCard>
+            <QCard class="vn-one" v-if="entity.account">
+                <a
+                    class="header link"
+                    :href="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
+                    link
+                >
+                    {{ t('customer.summary.financialData') }}
+                    <QIcon name="vn:grafana" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('customer.summary.risk')"
+                    :value="toCurrency(entity?.debt?.debt)"
+                    :class="debtWarning"
+                    :info="t('customer.summary.riskInfo')"
+                />
 
-                        <QItem v-if="entity.salesPersonUser" class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.salesPerson') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.salesPersonUser.name }}
-                            </QItemLabel>
-                        </QItem>
+                <VnLv
+                    :label="t('customer.summary.credit')"
+                    :value="toCurrency(entity.credit)"
+                    :class="creditWarning"
+                    :info="t('customer.summary.creditInfo')"
+                />
 
-                        <QItem class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.phone') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.phone }}
-                            </QItemLabel>
-                        </QItem>
+                <VnLv
+                    v-if="entity.creditInsurance"
+                    :label="t('customer.summary.securedCredit')"
+                    :value="toCurrency(entity.creditInsurance)"
+                    :info="t('customer.summary.securedCreditInfo')"
+                />
 
-                        <QItem class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.mobile') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">{{
-                                entity.mobile
-                            }}</QItemLabel>
-                        </QItem>
+                <VnLv
+                    :label="t('customer.summary.balance')"
+                    :value="toCurrency(entity.sumRisk) || toCurrency(0)"
+                    :info="t('customer.summary.balanceInfo')"
+                />
 
-                        <QItem v-if="entity.contactChannel" class="row col">
-                            <QItemLabel class="col" caption>
-                                {{ t('customer.summary.contactChannel') }}
-                            </QItemLabel>
-                            <QItemLabel class="col q-ma-none">
-                                {{ entity.contactChannel.name }}
-                            </QItemLabel>
-                        </QItem>
-
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.email') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.email }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.fiscalAddress') }}
-                        </QItemLabel>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.socialName') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.socialName }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.fiscalId') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.fi }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.postcode') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.postcode }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.province">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.province') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.province.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.country">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.country') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.country.country }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.street') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.street }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.fiscalData') }}
-                        </QItemLabel>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.isEqualizated"
-                                :label="t('customer.summary.isEqualizated')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.isActive"
-                                :label="t('customer.summary.isActive')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.hasToInvoiceByAddress"
-                                :label="t('customer.summary.invoiceByAddress')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.isTaxDataChecked"
-                                :label="t('customer.summary.verifiedData')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.hasToInvoice"
-                                :label="t('customer.summary.hasToInvoice')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.isToBeMailed"
-                                :label="t('customer.summary.notifyByEmail')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.isVies"
-                                :label="t('customer.summary.vies')"
-                                disable
-                            />
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.billingData') }}
-                        </QItemLabel>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.payMethod') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.payMethod.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.bankAccount') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.iban }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.dueDay') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.dueDay }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.hasLcr"
-                                :label="t('customer.summary.hasLcr')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.hasCoreVnl"
-                                :label="t('customer.summary.hasCoreVnl')"
-                                disable
-                            />
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.hasSepaVnl"
-                                :label="t('customer.summary.hasB2BVnl')"
-                                disable
-                            />
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col" v-if="entity.defaultAddress">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.consignee') }}
-                        </QItemLabel>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.addressName') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ entity.defaultAddress.nickname }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.addressCity') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.defaultAddress.city }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.addressStreet') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ entity.defaultAddress.street }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col" v-if="entity.account">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.webAccess') }}
-                        </QItemLabel>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.username') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ entity.account.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem dense>
-                            <QCheckbox
-                                v-model="entity.account.active"
-                                :label="t('customer.summary.webAccess')"
-                                disable
-                            />
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.businessData') }}
-                        </QItemLabel>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.totalGreuge') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toCurrency(entity.totalGreuge) }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.mana">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.mana') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toCurrency(entity.mana.mana) }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.claimsRatio">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.priceIncreasingRate') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toPercentage(priceIncreasingRate) }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.averageInvoiced">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.averageInvoiced') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toCurrency(entity.averageInvoiced.invoiced) }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.claimsRatio">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.claimRate') }}
-                                </QItemLabel>
-                                <QItemLabel>{{ toPercentage(claimRate) }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-                <div class="col">
-                    <QList>
-                        <QItemLabel header class="text-h6">
-                            {{ t('customer.summary.financialData') }}
-                        </QItemLabel>
-                        <QItem v-if="entity.debt">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.risk') }}
-                                </QItemLabel>
-                                <QItemLabel :class="debtWarning">
-                                    {{ toCurrency(entity.debt.debt) }}
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection side>
-                                <QIcon name="vn:info">
-                                    <QTooltip>
-                                        {{ t('customer.summary.riskInfo') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.credit') }}
-                                </QItemLabel>
-                                <QItemLabel :class="creditWarning">
-                                    {{ toCurrency(entity.credit) }}
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection side>
-                                <QIcon name="vn:info">
-                                    <QTooltip>
-                                        {{ t('customer.summary.creditInfo') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.creditInsurance">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.securedCredit') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toCurrency(entity.creditInsurance) }}
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection side>
-                                <QIcon name="vn:info">
-                                    <QTooltip>
-                                        {{ t('customer.summary.securedCreditInfo') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </QItemSection>
-                        </QItem>
-                        <QItem>
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.balance') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toCurrency(entity.sumRisk) || toCurrency(0) }}
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection side>
-                                <QIcon name="vn:info">
-                                    <QTooltip>
-                                        {{ t('customer.summary.balanceInfo') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.defaulters">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.balanceDue') }}
-                                </QItemLabel>
-                                <QItemLabel :class="balanceDueWarning">
-                                    {{ toCurrency(balanceDue) }}
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection side>
-                                <QIcon name="vn:info">
-                                    <QTooltip>
-                                        {{ t('customer.summary.balanceDueInfo') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </QItemSection>
-                        </QItem>
-                        <QItem v-if="entity.recovery">
-                            <QItemSection>
-                                <QItemLabel caption>
-                                    {{ t('customer.summary.recoverySince') }}
-                                </QItemLabel>
-                                <QItemLabel>
-                                    {{ toDate(entity.recovery.started) }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-            </QCardSection>
+                <VnLv
+                    v-if="entity.defaulters"
+                    :label="t('customer.summary.balanceDue')"
+                    :value="toCurrency(balanceDue)"
+                    :class="balanceDueWarning"
+                    :info="t('customer.summary.balanceDueInfo')"
+                />
+                <VnLv
+                    v-if="entity.recovery"
+                    :label="t('customer.summary.recoverySince')"
+                    :value="toDate(entity.recovery.started)"
+                />
+            </QCard>
         </template>
     </CardSummary>
 </template>
-
-<style lang="scss">
-.q-item__label + .q-item__label {
-    margin: 0;
-}
-</style>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 7cf260a73..d87af6cab 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -5,12 +5,7 @@ const customer = reactive({
     name: '',
 });
 
-watch(
-    () => customer.name,
-    () => {
-        console.log('customer.name changed');
-    }
-);
+watch(() => customer.name);
 </script>
 
 <template>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index acd5e3bdf..219ef0be3 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -7,6 +7,8 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CustomerFilter from './CustomerFilter.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -66,85 +68,40 @@ function viewSummary(id) {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QCard class="card q-mb-md" v-for="row of rows" :key="row.id">
-                        <QItem
-                            class="q-pa-none items-start cursor-pointer q-hoverable"
-                            v-ripple
-                            clickable
-                        >
-                            <QItemSection class="q-pa-md" @click="navigate(row.id)">
-                                <div class="text-h6">{{ row.name }}</div>
-                                <QItemLabel caption>#{{ row.id }}</QItemLabel>
-
-                                <QList>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('customer.list.email') }}
-                                            </QItemLabel>
-                                            <QItemLabel>{{ row.email }}</QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('customer.list.phone') }}
-                                            </QItemLabel>
-                                            <QItemLabel>{{ row.phone }}</QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QItemSection>
-                            <QSeparator vertical />
-                            <QCardActions vertical class="justify-between">
-                                <!-- <QBtn color="grey-7" round flat icon="more_vert">
-                                    <QTooltip>{{ t('customer.list.moreOptions') }}</QTooltip>
-                                    <QMenu cover auto-close>
-                                        <QList>
-                                            <QItem clickable>
-                                                <QItemSection avatar>
-                                                    <QIcon name="add" />
-                                                </QItemSection>
-                                                <QItemSection>Add a note</QItemSection>
-                                            </QItem>
-                                            <QItem clickable>
-                                                <QItemSection avatar>
-                                                    <QIcon name="history" />
-                                                </QItemSection>
-                                                <QItemSection>Display customer history</QItemSection>
-                                            </QItem>
-                                        </QList>
-                                    </QMenu>
-                                </QBtn> -->
-
-                                <QBtn
-                                    flat
-                                    round
-                                    color="primary"
-                                    icon="arrow_circle_right"
-                                    @click="navigate(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openCard') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    color="grey-7"
-                                    icon="preview"
-                                    @click="viewSummary(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openSummary') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <!-- <QBtn flat round color="grey-7" icon="vn:ticket">
-                                <QTooltip>{{ t('customer.list.customerOrders') }}</QTooltip>
-                            </QBtn> -->
-                            </QCardActions>
-                        </QItem>
-                    </QCard>
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv label="ID" :value="row.id" />
+                            <VnLv :label="t('customer.list.email')" :value="row.email" />
+                            <VnLv :label="t('customer.list.phone')" :value="row.phone" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                flat
+                                color="primary"
+                                icon="arrow_circle_right"
+                                @click.stop="navigate(row.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('components.smartCard.openCard') }}
+                                </QTooltip>
+                            </QBtn>
+                            <QBtn
+                                flat
+                                color="grey-7"
+                                icon="preview"
+                                @click.stop="viewSummary(row.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('components.smartCard.openSummary') }}
+                                </QTooltip>
+                            </QBtn>
+                        </template>
+                    </CardList>
                 </template>
             </VnPaginate>
         </div>
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 8db97c448..da6a2cb7d 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -90,7 +90,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
 
 <i18n>
 {
-    "en": { 
+    "en": {
         "pinnedInfo": "Your pinned modules will be shown here..."
     },
     "es": {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index fb7cf5c98..f6abd77e0 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -5,6 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -42,6 +44,8 @@ const filter = {
 function ticketFilter(invoice) {
     return JSON.stringify({ refFk: invoice.ref });
 }
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -50,47 +54,31 @@ function ticketFilter(invoice) {
         module="InvoiceOut"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
-        <template #description="{ entity }">
-            <span>
-                {{ entity.ref }}
-                <QTooltip>{{ entity.ref }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.issued') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.issued) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.amount') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toCurrency(entity.amount) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.client">
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.client') }}
-                        </QItemLabel>
-                        <QItemLabel class="link">
-                            {{ entity.client.name }}
-                            <CustomerDescriptorProxy :id="entity.client.id" />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.company">
-                        <QItemLabel caption>{{
-                            t('invoiceOut.card.company')
-                        }}</QItemLabel>
-                        <QItemLabel>{{ entity.company.code }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
+            <VnLv
+                :label="t('invoiceOut.card.amount')"
+                :value="toCurrency(entity.amount)"
+            />
+            <VnLv v-if="entity.client" :label="t('invoiceOut.card.client')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.name }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.company"
+                :label="t('invoiceOut.card.company')"
+                :value="entity.company.code"
+            />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     v-if="entity.client"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 71ec773e9..5a56a3957 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -4,8 +4,15 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
-onMounted(() => fetch());
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import { getUrl } from 'src/composables/getUrl';
+
+onMounted(async () => {
+    fetch();
+    salixUrl.value = await getUrl('');
+    invoiceOutUrl.value = salixUrl.value + `invoiceOut/${entityId.value}/`;
+});
 
 const route = useRoute();
 const { t } = useI18n();
@@ -19,20 +26,13 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 
-const invoiceOut = ref(null);
-const tax = ref(null);
-const tikets = ref(null);
+const salixUrl = ref();
+const invoiceOutUrl = ref();
+const tickets = ref(null);
 
 function fetch() {
-    const id = entityId.value;
-
-    axios.get(`InvoiceOuts/${id}/summary`).then(({ data }) => {
-        invoiceOut.value = data.invoiceOut;
-        tax.value = data.invoiceOut.taxesBreakdown;
-    });
-
-    axios.get(`InvoiceOuts/${id}/getTickets`).then(({ data }) => {
-        tikets.value = data;
+    axios.get(`InvoiceOuts/${entityId.value}/getTickets`).then(({ data }) => {
+        tickets.value = data;
     });
 }
 
@@ -95,124 +95,64 @@ const ticketsColumns = ref([
 </script>
 
 <template>
-    <div class="summary container">
-        <QCard>
-            <SkeletonSummary v-if="!invoiceOut" />
-            <template v-if="invoiceOut">
-                <div class="header bg-primary q-pa-sm q-mb-md">
-                    {{ invoiceOut.ref }} - {{ invoiceOut.client.socialName }}
+    <CardSummary ref="summary" :url="`InvoiceOuts/${entityId}/summary`">
+        <template #header="{ entity: { invoiceOut } }">
+            <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
+        </template>
+        <template #body="{ entity: { invoiceOut } }">
+            <QCard class="vn-one">
+                <div class="header">
+                    {{ t('invoiceOut.pageTitles.basicData') }}
                 </div>
-                <QList>
-                    <QItem>
-                        <QItemSection>
-                            <QItemLabel caption>{{
-                                t('invoiceOut.summary.issued')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ toDate(invoiceOut.issued) }}</QItemLabel>
-                        </QItemSection>
-                        <QItemSection>
-                            <QItemLabel caption>{{
-                                t('invoiceOut.summary.dued')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ toDate(invoiceOut.dued) }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <QItemLabel caption>{{
-                                t('invoiceOut.summary.created')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ toDate(invoiceOut.created) }}</QItemLabel>
-                        </QItemSection>
-                        <QItemSection>
-                            <QItemLabel caption>{{
-                                t('invoiceOut.summary.booked')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ toDate(invoiceOut.booked) }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <QItemLabel caption>{{
-                                t('invoiceOut.summary.company')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ invoiceOut.company.code }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-                <QCardSection class="q-pa-md">
-                    <h6>{{ t('invoiceOut.summary.taxBreakdown') }}</h6>
-                    <QTable :columns="taxColumns" :rows="tax" flat>
-                        <template #header="props">
-                            <QTr :props="props">
-                                <QTh
-                                    v-for="col in props.cols"
-                                    :key="col.name"
-                                    :props="props"
-                                >
-                                    {{ t(col.label) }}
-                                </QTh>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </QCardSection>
-                <QCardSection class="q-pa-md">
-                    <h6>{{ t('invoiceOut.summary.tickets') }}</h6>
-                    <QTable :columns="ticketsColumns" :rows="tikets" flat>
-                        <template #header="props">
-                            <QTr :props="props">
-                                <QTh
-                                    v-for="col in props.cols"
-                                    :key="col.name"
-                                    :props="props"
-                                >
-                                    {{ t(col.label) }}
-                                </QTh>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </QCardSection>
-            </template>
-        </QCard>
-    </div>
+                <VnLv
+                    :label="t('invoiceOut.summary.issued')"
+                    :value="toDate(invoiceOut.issued)"
+                />
+                <VnLv
+                    :label="t('invoiceOut.summary.dued')"
+                    :value="toDate(invoiceOut.dued)"
+                />
+                <VnLv
+                    :label="t('invoiceOut.summary.created')"
+                    :value="toDate(invoiceOut.created)"
+                />
+                <VnLv
+                    :label="t('invoiceOut.summary.booked')"
+                    :value="toDate(invoiceOut.booked)"
+                />
+                <VnLv
+                    :label="t('invoiceOut.summary.company')"
+                    :value="invoiceOut.company.code"
+                />
+            </QCard>
+            <QCard class="vn-three">
+                <div class="header">
+                    {{ t('invoiceOut.summary.taxBreakdown') }}
+                </div>
+                <QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+            <QCard class="vn-three">
+                <div class="header">
+                    {{ t('invoiceOut.summary.tickets') }}
+                </div>
+                <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+        </template>
+    </CardSummary>
 </template>
-
-<style lang="scss" scoped>
-.container {
-    display: flex;
-    justify-content: center;
-}
-
-.q-card {
-    width: 100%;
-    min-width: 950px;
-    max-width: 950px;
-}
-
-.summary {
-    .header {
-        text-align: center;
-        font-size: 18px;
-    }
-
-    #slider-container {
-        max-width: 80%;
-        margin: 0 auto;
-
-        .q-slider {
-            .q-slider__marker-labels:nth-child(1) {
-                transform: none;
-            }
-            .q-slider__marker-labels:nth-child(2) {
-                transform: none;
-                left: auto !important;
-                right: 0%;
-            }
-        }
-    }
-}
-
-.q-dialog .summary {
-    max-width: 1200px;
-}
-</style>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 00bed322e..137dedba8 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -9,6 +9,8 @@ import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue';
 import { toDate, toCurrency } from 'src/filters/index';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -71,97 +73,59 @@ function viewSummary(id) {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QCard class="card q-mb-md" v-for="row of rows" :key="row.id">
-                        <QItem
-                            class="q-pa-none items-start cursor-pointer q-hoverable"
-                            v-ripple
-                            clickable
-                        >
-                            <QItemSection class="q-pa-md" @click="navigate(row.id)">
-                                <div class="text-h6">{{ row.ref }}</div>
-                                <QItemLabel caption>#{{ row.id }}</QItemLabel>
-                                <QList>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.issued') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toDate(row.issued) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.amount') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toCurrency(row.amount) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.client') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.clientSocialName }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.created') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toDate(row.created) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.company') }}
-                                            </QItemLabel>
-                                            <QItemLabel>{{ row.companyCode }}</QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('invoiceOut.list.dued') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toDate(row.dued) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QItemSection>
-                            <QSeparator vertical />
-                            <QCardActions vertical class="justify-between">
-                                <QBtn
-                                    flat
-                                    round
-                                    color="orange"
-                                    icon="arrow_circle_right"
-                                    @click="navigate(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openCard') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    color="grey-7"
-                                    icon="preview"
-                                    @click="viewSummary(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openSummary') }}
-                                    </QTooltip>
-                                </QBtn>
-                            </QCardActions>
-                        </QItem>
-                    </QCard>
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.ref"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv label="ID" :value="row.id" />
+                            <VnLv
+                                :label="t('invoiceOut.list.shortIssued')"
+                                :title-label="t('invoiceOut.list.issued')"
+                                :value="toDate(row.issued)"
+                            />
+                            <VnLv
+                                :label="t('invoiceOut.list.amount')"
+                                :value="toCurrency(row.amount)"
+                            />
+                            <VnLv
+                                :label="t('invoiceOut.list.client')"
+                                :value="row.clientSocialName"
+                            />
+                            <VnLv
+                                :label="t('invoiceOut.list.shortCreated')"
+                                :title-label="t('invoiceOut.list.created')"
+                                :value="toDate(row.created)"
+                            />
+                            <VnLv
+                                :label="t('invoiceOut.list.company')"
+                                :value="row.companyCode"
+                            />
+                            <VnLv
+                                :label="t('invoiceOut.list.shortDued')"
+                                :title-label="t('invoiceOut.list.dued')"
+                                :value="toDate(row.dued)"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                flat
+                                icon="arrow_circle_right"
+                                @click.stop="navigate(row.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('components.smartCard.openCard') }}
+                                </QTooltip>
+                            </QBtn>
+                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
+                                <QTooltip>
+                                    {{ t('components.smartCard.openSummary') }}
+                                </QTooltip>
+                            </QBtn>
+                        </template>
+                    </CardList>
                 </template>
             </VnPaginate>
         </div>
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index 747fe8b14..7c0bbbd44 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -1,58 +1,30 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { Dark, Quasar, useQuasar } from 'quasar';
+import { ref } from 'vue';
+import { Notify, useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
 
 import { useSession } from 'src/composables/useSession';
+import { useLogin } from 'src/composables/useLogin';
 
 const quasar = useQuasar();
 const session = useSession();
+const loginCache = useLogin();
 const router = useRouter();
-const { t, locale } = useI18n();
-
-const userLocale = computed({
-    get() {
-        return locale.value;
-    },
-    set(value) {
-        locale.value = value;
-
-        if (value === 'en') value = 'en-GB';
-
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
-    },
-});
-
-const darkMode = computed({
-    get() {
-        return Dark.isActive;
-    },
-    set(value) {
-        Dark.set(value);
-    },
-});
+const { t } = useI18n();
 
 const username = ref('');
 const password = ref('');
 const keepLogin = ref(true);
 
 async function onSubmit() {
+    const params = {
+        user: username.value,
+        password: password.value,
+    };
     try {
-        const { data } = await axios.post('Accounts/login', {
-            user: username.value,
-            password: password.value,
-        });
+        const { data } = await axios.post('Accounts/login', params);
 
         if (!data) return;
 
@@ -69,122 +41,63 @@ async function onSubmit() {
         } else {
             router.push({ name: 'Dashboard' });
         }
-    } catch (e) {
-        //
+    } catch (res) {
+        if (res.response?.data?.error?.code === 'REQUIRES_2FA') {
+            Notify.create({
+                message: t('login.twoFactorRequired'),
+                icon: 'phonelink_lock',
+                type: 'warning',
+            });
+            params.keepLogin = keepLogin.value;
+            loginCache.setUser(params);
+            return router.push({
+                name: 'TwoFactor',
+                query: router.currentRoute.value?.query,
+            });
+        }
+        Notify.create({
+            message: t('login.loginError'),
+            type: 'negative',
+        });
     }
 }
 </script>
 
 <template>
-    <QLayout>
-        <QPageContainer>
-            <QPage id="login">
-                <QPageSticky position="top-right">
-                    <QToolbar>
-                        <QBtn
-                            id="switchLanguage"
-                            :label="t('globals.language')"
-                            icon="translate"
-                            color="primary"
-                            size="sm"
-                            flat
-                            rounded
-                        >
-                            <QMenu auto-close>
-                                <QList dense>
-                                    <QItem
-                                        @click="userLocale = 'en'"
-                                        :active="userLocale == 'en'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.en') }}
-                                    </QItem>
-                                    <QItem
-                                        @click="userLocale = 'es'"
-                                        :active="userLocale == 'es'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.es') }}
-                                    </QItem>
-                                </QList>
-                            </QMenu>
-                        </QBtn>
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t(`globals.darkMode`) }}
-                                    </QItemLabel>
-                                </QItemSection>
-                                <QItemSection side>
-                                    <QToggle
-                                        v-model="darkMode"
-                                        checked-icon="dark_mode"
-                                        unchecked-icon="light_mode"
-                                    />
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </QToolbar>
-                </QPageSticky>
-                <div class="login-form q-pa-xl">
-                    <QImg
-                        src="~/assets/logo.svg"
-                        alt="Logo"
-                        fit="contain"
-                        :ratio="16 / 9"
-                        class="q-mb-md"
-                    />
-                    <QForm @submit="onSubmit" class="q-gutter-md">
-                        <QInput
-                            v-model="username"
-                            :label="t('login.username')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QInput
-                            type="password"
-                            v-model="password"
-                            :label="t('login.password')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
+    <QImg
+        src="~/assets/logo.svg"
+        alt="Logo"
+        fit="contain"
+        :ratio="16 / 9"
+        class="q-mb-md"
+    />
+    <QForm @submit="onSubmit" class="q-gutter-md q-pa-lg">
+        <QInput
+            v-model="username"
+            :label="t('login.username')"
+            lazy-rules
+            :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
+        />
+        <QInput
+            type="password"
+            v-model="password"
+            :label="t('login.password')"
+            lazy-rules
+            :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
+        />
+        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
 
-                        <div>
-                            <QBtn
-                                :label="t('login.submit')"
-                                type="submit"
-                                color="primary"
-                                class="full-width"
-                                rounded
-                                unelevated
-                            />
-                        </div>
-                    </QForm>
-                </div>
-            </QPage>
-        </QPageContainer>
-    </QLayout>
+        <div>
+            <QBtn
+                :label="t('login.submit')"
+                type="submit"
+                color="primary"
+                class="full-width"
+                rounded
+                unelevated
+            />
+        </div>
+    </QForm>
 </template>
 
-<style lang="scss" scoped>
-#login {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: inherit;
-}
-
-.login-form {
-    width: 400px;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
new file mode 100644
index 000000000..f14e85418
--- /dev/null
+++ b/src/pages/Login/TwoFactor.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { ref } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import axios from 'axios';
+
+import { useSession } from 'src/composables/useSession';
+import { useLogin } from 'src/composables/useLogin';
+
+const quasar = useQuasar();
+const session = useSession();
+const router = useRouter();
+const loginCache = useLogin();
+const { t } = useI18n();
+
+const code = ref('');
+const params = loginCache.getUser().value;
+if (!params.user) {
+    router.push({ name: 'Login' });
+}
+
+async function onSubmit() {
+    try {
+        params.code = code.value;
+        const { data } = await axios.post('VnUsers/validate-auth', params);
+
+        if (!data) return;
+
+        await session.login(data.token, params.keepLogin);
+        quasar.notify({
+            message: t('login.loginSuccess'),
+            type: 'positive',
+        });
+
+        const currentRoute = router.currentRoute.value;
+        if (currentRoute.query && currentRoute.query.redirect) {
+            router.push(currentRoute.query.redirect);
+        } else {
+            router.push({ name: 'Dashboard' });
+        }
+    } catch (e) {
+        quasar.notify({
+            message: e.response?.data?.error.message,
+            type: 'negative',
+        });
+    }
+}
+</script>
+<template>
+    <QForm @submit="onSubmit" class="q-gutter-md q-pa-lg">
+        <div class="column items-center">
+            <QIcon name="phonelink_lock" size="xl" color="primary" />
+            <h5 class="text-center q-my-md">{{ t('twoFactor.insert') }}</h5>
+        </div>
+        <QInput
+            v-model="code"
+            :hint="t('twoFactor.explanation')"
+            mask="# # # # # #"
+            fill-mask
+            unmasked-value
+            autofocus
+        >
+            <template #prepend>
+                <QIcon name="lock" />
+            </template>
+        </QInput>
+        <div class="q-mt-xl">
+            <QBtn
+                :label="t('twoFactor.validate')"
+                type="submit"
+                color="primary"
+                class="full-width q-mt-md"
+                rounded
+                unelevated
+            />
+        </div>
+    </QForm>
+</template>
+<style lang="scss" scoped></style>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index f7c773352..497d20914 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -56,8 +56,8 @@ const columns = computed(() => [
     },
 ]);
 function getProjectUrl() {
-    return ((new URL(window.location)).origin);
-};
+    return new URL(window.location).origin;
+}
 </script>
 <template>
     <div class="column items-center">
@@ -79,34 +79,39 @@ function getProjectUrl() {
                         :grid="$q.screen.lt.md"
                         auto-load
                     >
-                    <template #top>
-                        {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
-                    </template>
-                    <template #body-cell-cmrFk="{ value }">
-                        <QTd align="right" class="text-primary">
-                                <a :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`" target="_blank">
+                        <template #top>
+                            {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
+                        </template>
+                        <template #body-cell-cmrFk="{ value }">
+                            <QTd align="right" class="text-primary">
+                                <a
+                                    :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`"
+                                    target="_blank"
+                                >
                                     <span class="text-primary">{{ value }}</span>
                                 </a>
-                        </QTd>
-                    </template>
-                    <template #body-cell-hasCmrDms="{ value }">
-                        <QTd align="center">
-                            <QBadge
-                                :id="(value) ? 'true' : 'false'" 
-                                :label="(value)
-                                    ? t('route.cmr.list.true')
-                                    : t('route.cmr.list.false')"
-                            />
-                        </QTd>
-                    </template>
+                            </QTd>
+                        </template>
+                        <template #body-cell-hasCmrDms="{ value }">
+                            <QTd align="center">
+                                <QBadge
+                                    :id="value ? 'true' : 'false'"
+                                    :label="
+                                        value
+                                            ? t('route.cmr.list.true')
+                                            : t('route.cmr.list.false')
+                                    "
+                                />
+                            </QTd>
+                        </template>
                     </QTable>
                 </template>
             </VnPaginate>
         </div>
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-                <QScrollArea class="fit text-grey-8">
-                    <CmrFilter data-key="CmrList" />
-                </QScrollArea>
+            <QScrollArea class="fit text-grey-8">
+                <CmrFilter data-key="CmrList" />
+            </QScrollArea>
         </QDrawer>
     </div>
 </template>
@@ -127,4 +132,4 @@ function getProjectUrl() {
 #false {
     background-color: $negative;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 845e5f465..25c9dfb1c 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -1,11 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -66,78 +68,60 @@ const filter = {
     ],
 };
 
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.client.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Ticket" :url="`Tickets/${entityId}`" :filter="filter">
+    <CardDescriptor
+        module="Ticket"
+        :url="`Tickets/${entityId}`"
+        :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection v-if="entity.ticketState">
-                        <QItemLabel caption>{{ t('ticket.card.state') }}</QItemLabel>
-                        <QItemLabel :class="stateColor(entity.ticketState.state)">
-                            {{ entity.ticketState.state.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.shipped') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.shipped) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.customerId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.clientFk }}
-                                <CustomerDescriptorProxy :id="entity.client.id" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.client && entity.client.salesPersonUser">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.salesPerson') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.client.salesPersonUser.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.warehouse">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.warehouse') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.warehouse.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="entity.agencyMode">
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('ticket.card.agency') }}</QItemLabel>
-                        <QItemLabel>{{ entity.agencyMode.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+                <template #value>
+                    <QBadge :color="entity.ticketState.state.classColor">
+                        {{ entity.ticketState.state.name }}
+                    </QBadge>
+                </template>
+            </VnLv>
+            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv :label="t('ticket.card.customerId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.clientFk }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('ticket.summary.salesPerson')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.salesPersonUser.name }}
+                        <WorkerDescriptorProxy
+                            :id="entity.client.salesPersonFk"
+                            v-if="entity.client.salesPersonFk"
+                        />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
+            <VnLv
+                v-if="entity.agencyMode"
+                :label="t('ticket.card.agency')"
+                :value="entity.agencyMode.name"
+            />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -147,7 +131,8 @@ function stateColor(state) {
                     <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
                 </QIcon>
             </QCardActions>
-
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 945a98925..ce46d1d47 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -4,14 +4,15 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
-import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import { getUrl } from 'src/composables/getUrl';
 
-onMounted(() => fetch());
-onUpdated(() => fetch());
+onUpdated(() => summaryRef.value.fetch());
 
 const route = useRoute();
 const router = useRouter();
@@ -28,25 +29,22 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 
+const summaryRef = ref();
 const ticket = ref();
 const salesLines = ref(null);
 const editableStates = ref([]);
+const ticketUrl = ref();
 
-async function fetch() {
-    const { data } = await axios.get(`Tickets/${entityId.value}/summary`);
+onMounted(async () => {
+    ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
+});
+async function setData(data) {
     if (data) {
         ticket.value = data;
         salesLines.value = data.sales;
     }
 }
 
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
-
 function formattedAddress() {
     if (!ticket.value) return '';
 
@@ -76,7 +74,7 @@ async function changeState(value) {
     };
 
     await axios.post(`TicketTrackings/changeState`, formData);
-    await router.go(route.fullPath);
+    router.go(route.fullPath);
 }
 </script>
 
@@ -86,632 +84,382 @@ async function changeState(value) {
         @on-fetch="(data) => (editableStates = data)"
         auto-load
     />
-    <div class="summary container">
-        <QCard>
-            <SkeletonSummary v-if="!ticket" />
-            <template v-if="ticket">
-                <div class="header bg-primary q-pa-sm q-mb-md">
-                    <span>
-                        Ticket #{{ ticket.id }} - {{ ticket.client.name }} ({{
-                            ticket.client.id
-                        }}) -
-                        {{ ticket.nickname }}
-                    </span>
-                    <QBtnDropdown
-                        side
-                        top
-                        color="orange-11"
-                        text-color="black"
-                        :label="t('ticket.summary.changeState')"
-                        :disable="!isEditable()"
+    <CardSummary
+        ref="summaryRef"
+        :url="`Tickets/${entityId}/summary`"
+        @on-fetch="(data) => setData(data)"
+    >
+        <template #header="{ entity }">
+            <div>
+                Ticket #{{ entity.id }} - {{ entity.client.name }} ({{
+                    entity.client.id
+                }}) -
+                {{ entity.nickname }}
+            </div>
+        </template>
+        <template #header-right>
+            <QBtnDropdown
+                side
+                top
+                color="orange-11"
+                text-color="black"
+                :label="t('ticket.summary.changeState')"
+                :disable="!isEditable()"
+            >
+                <QList>
+                    <QVirtualScroll
+                        style="max-height: 300px"
+                        :items="editableStates"
+                        separator
+                        v-slot="{ item, index }"
                     >
-                        <QList>
-                            <QVirtualScroll
-                                style="max-height: 300px"
-                                :items="editableStates"
-                                separator
-                                v-slot="{ item, index }"
-                            >
-                                <QItem
-                                    :key="index"
-                                    dense
-                                    clickable
-                                    v-close-popup
-                                    @click="changeState(item.code)"
-                                >
-                                    <QItemSection>
-                                        <QItemLabel>{{ item.name }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </QVirtualScroll>
-                        </QList>
-                    </QBtnDropdown>
+                        <QItem
+                            :key="index"
+                            dense
+                            clickable
+                            v-close-popup
+                            @click="changeState(item.code)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{ item.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QVirtualScroll>
+                </QList>
+            </QBtnDropdown>
+        </template>
+        <template #body>
+            <QCard class="vn-max">
+                <div class="taxes">
+                    <VnLv
+                        :label="t('ticket.summary.subtotal')"
+                        :value="toCurrency(ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.vat')"
+                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.total')"
+                        :value="toCurrency(ticket.totalWithVat)"
+                    />
                 </div>
-                <div class="row q-pa-md q-col-gutter-md q-mb-md">
-                    <div class="col">
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t('ticket.summary.state') }}
-                                    </QItemLabel>
-                                    <QItemLabel
-                                        :class="stateColor(ticket.ticketState.state)"
-                                    >
-                                        {{ ticket.ticketState.state.name }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.salesPerson')
-                                    }}</QItemLabel>
-                                    <QItemLabel>
-                                        <span class="link">
-                                            {{ ticket.client.salesPersonUser.name }}
-                                            <WorkerDescriptorProxy
-                                                :id="ticket.client.salesPersonFk"
-                                            />
-                                        </span>
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.agency')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.agencyMode.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.zone')
-                                    }}</QItemLabel>
-                                    <QItemLabel class="link">{{
-                                        ticket.routeFk
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.warehouse')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.warehouse.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.invoice')
-                                    }}</QItemLabel>
-                                    <QItemLabel v-if="ticket.refFk">
-                                        <span class="link">
-                                            {{ ticket.refFk }}
-                                            <InvoiceOutDescriptorProxy :id="ticket.id" />
-                                        </span>
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
-                    <div class="col">
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.shipped')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ toDate(ticket.shipped) }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.landed')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ toDate(ticket.landed) }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.packages')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.packages }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.consigneePhone')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.address.phone }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.consigneeMobile')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.address.mobile }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.clientPhone')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.client.phone }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.clientMobile')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ ticket.client.mobile }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.consignee')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{ formattedAddress() }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
-                    <div class="col">
-                        <QList>
-                            <QItem v-for="note in ticket.notes" :key="note.id">
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ note.observationType.description }}
-                                    </QItemLabel>
-                                    <QItemLabel>
-                                        {{ note.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
-                    <div class="col">
-                        <QList class="taxes">
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.subtotal')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{
-                                        toCurrency(ticket.totalWithoutVat)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.vat')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{
-                                        toCurrency(
-                                            ticket.totalWithVat - ticket.totalWithoutVat
-                                        )
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>{{
-                                        t('ticket.summary.total')
-                                    }}</QItemLabel>
-                                    <QItemLabel>{{
-                                        toCurrency(ticket.totalWithVat)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
-                </div>
-                <div class="row q-pa-md" v-if="salesLines.length > 0">
-                    <div class="col">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('ticket.summary.saleLines') }}
-                                <RouterLink
-                                    :to="{
-                                        name: 'TicketBasicData',
-                                        params: { id: entityId },
-                                    }"
-                                    target="_blank"
-                                >
-                                    <QIcon name="open_in_new" />
-                                </RouterLink>
-                            </QItemLabel>
-                            <QTable :rows="ticket.sales" flat>
-                                <template #header="props">
-                                    <QTr :props="props">
-                                        <QTh auto-width></QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.item')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.visible')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.available')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.quantity')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.description')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.price')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.discount')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.amount')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.packing')
-                                        }}</QTh>
-                                    </QTr>
-                                </template>
-                                <template #body="props">
-                                    <QTr :props="props">
-                                        <QTd>
-                                            <QBtn
-                                                flat
-                                                round
-                                                size="xs"
-                                                icon="vn:claims"
-                                                v-if="props.row.claim"
-                                                color="primary"
-                                                :to="{
-                                                    name: 'ClaimCard',
-                                                    params: {
-                                                        id: props.row.claim.claimFk,
-                                                    },
-                                                }"
-                                            >
-                                                <QTooltip
-                                                    >{{ t('ticket.summary.claim') }}:
-                                                    {{
-                                                        props.row.claim.claimFk
-                                                    }}</QTooltip
-                                                >
-                                            </QBtn>
-                                            <QBtn
-                                                flat
-                                                round
-                                                size="xs"
-                                                icon="vn:claims"
-                                                v-if="props.row.claimBeginning"
-                                                color="primary"
-                                                :to="{
-                                                    name: 'ClaimCard',
-                                                    params: {
-                                                        id: props.row.claimBeginning
-                                                            .claimFk,
-                                                    },
-                                                }"
-                                            >
-                                                <QTooltip
-                                                    >{{ t('ticket.summary.claim') }}:
-                                                    {{
-                                                        props.row.claimBeginning.claimFk
-                                                    }}</QTooltip
-                                                >
-                                            </QBtn>
-                                            <QIcon
-                                                name="warning"
-                                                v-show="props.row.visible < 0"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip
-                                                    >{{ t('ticket.summary.visible') }}:
-                                                    {{ props.row.visible }}</QTooltip
-                                                >
-                                            </QIcon>
-                                            <QIcon
-                                                name="vn:reserva"
-                                                v-show="props.row.reserved"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip>
-                                                    {{ t('ticket.summary.reserved') }}
-                                                </QTooltip>
-                                            </QIcon>
-                                            <QIcon
-                                                name="vn:unavailable"
-                                                v-show="props.row.itemShortage"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip>
-                                                    {{ t('ticket.summary.itemShortage') }}
-                                                </QTooltip>
-                                            </QIcon>
-                                            <QIcon
-                                                name="vn:components"
-                                                v-show="props.row.hasComponentLack"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip>
-                                                    {{
-                                                        t(
-                                                            'ticket.summary.hasComponentLack'
-                                                        )
-                                                    }}
-                                                </QTooltip>
-                                            </QIcon>
-                                        </QTd>
-                                        <QTd class="link">{{ props.row.itemFk }}</QTd>
-                                        <QTd>{{ props.row.visible }}</QTd>
-                                        <QTd>{{ props.row.available }}</QTd>
-                                        <QTd>{{ props.row.quantity }}</QTd>
-                                        <QTd>
-                                            <div class="fetched-tags">
-                                                <span>{{ props.row.item.name }}</span>
-                                                <span
-                                                    v-if="props.row.item.subName"
-                                                    class="subName"
-                                                    >{{ props.row.item.subName }}</span
-                                                >
-                                            </div>
-                                            <fetched-tags
-                                                :item="props.row.item"
-                                                :max-length="5"
-                                            ></fetched-tags>
-                                        </QTd>
-                                        <QTd>{{ props.row.price }}</QTd>
-                                        <QTd>{{ props.row.discount }} %</QTd>
-                                        <QTd
-                                            >{{
-                                                toCurrency(
-                                                    props.row.quantity *
-                                                        props.row.price *
-                                                        ((100 - props.row.discount) / 100)
-                                                )
-                                            }}
-                                        </QTd>
-                                        <QTd>{{
-                                            dashIfEmpty(props.row.item.itemPackingTypeFk)
-                                        }}</QTd>
-                                    </QTr>
-                                </template>
-                            </QTable>
-                        </QList>
-                    </div>
-                </div>
-                <div
-                    class="row q-pa-md"
-                    v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="ticketUrl + 'basic-data/step-one'">
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv :label="t('ticket.summary.state')">
+                    <template #value>
+                        <QChip :color="ticket.ticketState.state.classColor ?? 'dark'">
+                            {{ ticket.ticketState.state.name }}
+                        </QChip>
+                    </template>
+                </VnLv>
+                <VnLv :label="t('ticket.summary.salesPerson')">
+                    <template #value>
+                        <span class="link">
+                            {{ ticket.client?.salesPersonUser?.name }}
+                            <WorkerDescriptorProxy
+                                :id="ticket.client.salesPersonFk"
+                                v-if="ticket.client.salesPersonFk"
+                            />
+                        </span>
+                    </template>
+                </VnLv>
+                <VnLv
+                    :label="t('ticket.summary.agency')"
+                    :value="ticket.agencyMode.name"
+                />
+                <VnLv :label="t('ticket.summary.zone')" :value="ticket.zone.name" />
+                <VnLv
+                    :label="t('ticket.summary.warehouse')"
+                    :value="ticket.warehouse?.name"
+                />
+                <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
+                <VnLv :label="t('ticket.summary.invoice')">
+                    <template #value>
+                        <span class="link">
+                            {{ dashIfEmpty(ticket.refFk) }}
+                            <InvoiceOutDescriptorProxy
+                                :id="ticket.id"
+                                v-if="ticket.refFk"
+                            />
+                        </span>
+                    </template>
+                </VnLv>
+                <VnLv
+                    :label="t('ticket.summary.weight')"
+                    :value="dashIfEmpty(ticket.weight)"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="ticketUrl + 'basic-data/step-one'">
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    :label="t('ticket.summary.shipped')"
+                    :value="toDate(ticket.shipped)"
+                />
+                <VnLv
+                    :label="t('ticket.summary.landed')"
+                    :value="toDate(ticket.landed)"
+                />
+                <VnLv :label="t('ticket.summary.packages')" :value="ticket.packages" />
+                <VnLv
+                    :label="t('ticket.summary.consigneePhone')"
+                    :value="ticket.address.phone"
+                />
+                <VnLv
+                    :label="t('ticket.summary.consigneeMobile')"
+                    :value="ticket.address.mobile"
+                />
+                <VnLv
+                    :label="t('ticket.summary.clientPhone')"
+                    :value="ticket.client.phone"
+                />
+                <VnLv
+                    :label="t('ticket.summary.clientMobile')"
+                    :value="ticket.client.mobile"
+                />
+                <VnLv
+                    :label="t('ticket.summary.consignee')"
+                    :value="formattedAddress()"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="ticketUrl + 'observation'">
+                    {{ t('ticket.pageTitles.notes') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv
+                    v-for="note in ticket.notes"
+                    :key="note.id"
+                    :label="note.observationType.description"
+                    :value="note.description"
                 >
-                    <div class="col" v-if="ticket.packagings.length > 0">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('ticket.summary.packages') }}
-                                <QIcon name="open_in_new" />
-                            </QItemLabel>
-                            <QTable :rows="ticket.packagings" flat>
-                                <template #header="props">
-                                    <QTr :props="props">
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.created')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.package')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.quantity')
-                                        }}</QTh>
-                                    </QTr>
-                                </template>
-                                <template #body="props">
-                                    <QTr :props="props">
-                                        <QTd>{{ toDate(props.row.created) }}</QTd>
-                                        <QTd>{{ props.row.packaging.item.name }}</QTd>
-                                        <QTd>{{ props.row.quantity }}</QTd>
-                                    </QTr>
-                                </template>
-                            </QTable>
-                        </QList>
-                    </div>
-                    <div class="col" v-if="ticket.services.length > 0">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('ticket.summary.services') }}
-                                <QIcon name="open_in_new" />
-                            </QItemLabel>
-                            <QTable :rows="ticket.services" flat>
-                                <template #header="props">
-                                    <QTr :props="props">
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.quantity')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.description')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.price')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.taxClass')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.amount')
-                                        }}</QTh>
-                                    </QTr>
-                                </template>
-                                <template #body="props">
-                                    <QTr :props="props">
-                                        <QTd>{{ props.row.quantity }}</QTd>
-                                        <QTd>{{ props.row.description }}</QTd>
-                                        <QTd>{{ toCurrency(props.row.price) }}</QTd>
-                                        <QTd>{{ props.row.taxClass.description }}</QTd>
-                                        <QTd>{{
-                                            toCurrency(
-                                                props.row.quantity * props.row.price
-                                            )
-                                        }}</QTd>
-                                    </QTr>
-                                </template>
-                            </QTable>
-                        </QList>
-                    </div>
-                </div>
-                <div class="row q-pa-md" v-if="ticket.requests.length > 0">
-                    <div class="col">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('ticket.summary.request') }}
-                                <QIcon name="open_in_new" />
-                            </QItemLabel>
-                            <QTable :rows="ticket.requests" flat>
-                                <template #header="props">
-                                    <QTr :props="props">
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.description')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.created')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.requester')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.atender')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.quantity')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.price')
-                                        }}</QTh>
-                                        <QTh auto-width>{{
-                                            t('ticket.summary.item')
-                                        }}</QTh>
-                                        <QTh auto-width>Ok</QTh>
-                                    </QTr>
-                                </template>
-                                <template #body="props">
-                                    <QTr :props="props">
-                                        <QTd>{{ props.row.description }}</QTd>
-                                        <QTd>{{ toDate(props.row.created) }}</QTd>
-                                        <QTd>{{ props.row.requester.user.name }}</QTd>
-                                        <QTd>{{ props.row.atender.user.name }}</QTd>
-                                        <QTd>{{ props.row.quantity }}</QTd>
-                                        <QTd>{{ toCurrency(props.row.price) }}</QTd>
-                                        <QTd v-if="!props.row.sale">-</QTd>
-                                        <QTd v-if="props.row.sale" class="link">{{
-                                            props.row.sale.itemFk
-                                        }}</QTd>
-                                        <QTd
-                                            ><QCheckbox
-                                                v-model="props.row.isOk"
-                                                :disable="true"
-                                        /></QTd>
-                                    </QTr>
-                                </template>
-                            </QTable>
-                        </QList>
-                    </div>
-                </div>
-            </template>
-        </QCard>
-    </div>
+                    <template #value>
+                        <QInput
+                            v-model="note.description"
+                            filled
+                            type="textarea"
+                            class="notes"
+                            readonly
+                        />
+                    </template>
+                </VnLv>
+            </QCard>
+            <QCard class="vn-max">
+                <a class="header link" :href="ticketUrl + 'sale'">
+                    {{ t('ticket.summary.saleLines') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <QTable :rows="ticket.sales">
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh auto-width></QTh>
+                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.amount') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.packing') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>
+                                <QBtn
+                                    flat
+                                    round
+                                    size="xs"
+                                    icon="vn:claims"
+                                    v-if="props.row.claim"
+                                    color="primary"
+                                    :to="{
+                                        name: 'ClaimCard',
+                                        params: {
+                                            id: props.row.claim.claimFk,
+                                        },
+                                    }"
+                                >
+                                    <QTooltip
+                                        >{{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claim.claimFk }}</QTooltip
+                                    >
+                                </QBtn>
+                                <QBtn
+                                    flat
+                                    round
+                                    size="xs"
+                                    icon="vn:claims"
+                                    v-if="props.row.claimBeginning"
+                                    color="primary"
+                                    :to="{
+                                        name: 'ClaimCard',
+                                        params: {
+                                            id: props.row.claimBeginning.claimFk,
+                                        },
+                                    }"
+                                >
+                                    <QTooltip
+                                        >{{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claimBeginning.claimFk }}</QTooltip
+                                    >
+                                </QBtn>
+                                <QIcon
+                                    name="warning"
+                                    v-show="props.row.visible < 0"
+                                    size="xs"
+                                    color="primary"
+                                >
+                                    <QTooltip
+                                        >{{ t('ticket.summary.visible') }}:
+                                        {{ props.row.visible }}</QTooltip
+                                    >
+                                </QIcon>
+                                <QIcon
+                                    name="vn:reserva"
+                                    v-show="props.row.reserved"
+                                    size="xs"
+                                    color="primary"
+                                >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.reserved') }}
+                                    </QTooltip>
+                                </QIcon>
+                                <QIcon
+                                    name="vn:unavailable"
+                                    v-show="props.row.itemShortage"
+                                    size="xs"
+                                    color="primary"
+                                >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.itemShortage') }}
+                                    </QTooltip>
+                                </QIcon>
+                                <QIcon
+                                    name="vn:components"
+                                    v-show="props.row.hasComponentLack"
+                                    size="xs"
+                                    color="primary"
+                                >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.hasComponentLack') }}
+                                    </QTooltip>
+                                </QIcon>
+                            </QTd>
+                            <QTd class="link">{{ props.row.itemFk }}</QTd>
+                            <QTd>{{ props.row.visible }}</QTd>
+                            <QTd>{{ props.row.available }}</QTd>
+                            <QTd>{{ props.row.quantity }}</QTd>
+                            <QTd>
+                                <div class="fetched-tags">
+                                    <span>{{ props.row.item.name }}</span>
+                                    <span v-if="props.row.item.subName" class="subName">{{
+                                        props.row.item.subName
+                                    }}</span>
+                                </div>
+                                <fetched-tags
+                                    :item="props.row.item"
+                                    :max-length="5"
+                                ></fetched-tags>
+                            </QTd>
+                            <QTd>{{ props.row.price }}</QTd>
+                            <QTd>{{ props.row.discount }} %</QTd>
+                            <QTd
+                                >{{
+                                    toCurrency(
+                                        props.row.quantity *
+                                            props.row.price *
+                                            ((100 - props.row.discount) / 100)
+                                    )
+                                }}
+                            </QTd>
+                            <QTd>{{ dashIfEmpty(props.row.item.itemPackingTypeFk) }}</QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+            <QCard
+                class="vn-max"
+                v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
+            >
+                <a class="header link" :href="ticketUrl + 'package'">
+                    {{ t('ticket.summary.packages') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <QTable :rows="ticket.packagings" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
+                            <QTd>{{ props.row.packaging.item.name }}</QTd>
+                            <QTd>{{ props.row.quantity }}</QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+
+                <a class="header link q-mt-xl" :href="ticketUrl + 'service'">
+                    {{ t('ticket.summary.service') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <QTable :rows="ticket.services" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.taxClass') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.amount') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>{{ props.row.quantity }}</QTd>
+                            <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ toCurrency(props.row.price) }}</QTd>
+                            <QTd>{{ props.row.taxClass.description }}</QTd>
+                            <QTd>{{
+                                toCurrency(props.row.quantity * props.row.price)
+                            }}</QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+        </template>
+    </CardSummary>
 </template>
 <style lang="scss" scoped>
-.container {
-    display: flex;
-    justify-content: center;
+.notes {
+    width: max-content;
 }
-
-.q-card {
-    width: 100%;
-    height: 100%;
-    max-width: 1200px;
-}
-
-.summary {
-    .q-list {
-        .q-item__label--header {
-            display: flex;
-            justify-content: space-between;
-
-            a {
-                color: $primary;
-            }
-        }
-    }
-    .fetched-tags {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        & span {
-            flex-basis: 50%;
-        }
-        & span.subName {
-            flex-basis: 50%;
-            color: $secondary;
-            text-transform: uppercase;
-            font-size: 0.75rem;
-        }
-    }
-    .q-table__container {
-        text-align: left;
-        .q-icon {
-            padding: 2%;
-        }
-    }
-    .taxes {
-        border: $border-thin-light;
+.cardSummary .summaryBody > .q-card > .taxes {
+    border: 2px solid gray;
+    padding: 0;
+    > .vn-label-value {
         text-align: right;
-        padding: 8px;
-    }
-
-    .row {
-        flex-wrap: wrap;
-
-        .col {
-            min-width: 250px;
-            padding-left: 1.5%;
-            padding-right: 1.5%;
-        }
-    }
-
-    .header {
-        font-size: 18px;
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        align-content: center;
-        margin: 0;
-        text-align: center;
-
-        span {
-            flex: 1;
-        }
-
-        .q-btn {
-            flex: none;
-        }
+        flex-direction: row;
+        margin-top: 5px;
+        justify-content: flex-end;
+        padding-right: 20px;
     }
 }
 
-.q-dialog .summary {
-    max-width: 1200px;
+.cardSummary .summaryBody > .q-card:has(.taxes) {
+    margin-top: 2px;
+    padding: 0;
 }
 </style>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index afa504e8c..b9f0f57e7 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -9,6 +9,8 @@ import { toDate, toDateString, toCurrency } from 'src/filters/index';
 import TicketSummaryDialog from './Card/TicketSummaryDialog.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import TicketFilter from './TicketFilter.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
 
 const router = useRouter();
 const quasar = useQuasar();
@@ -18,34 +20,6 @@ const stateStore = useStateStore();
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-const filter = {
-    include: [
-        {
-            relation: 'client',
-            scope: {
-                include: {
-                    relation: 'salesPersonUser',
-                    scope: {
-                        fields: ['name'],
-                    },
-                },
-            },
-        },
-        {
-            relation: 'ticketState',
-            scope: {
-                fields: ['stateFk', 'code', 'alertLevel'],
-                include: {
-                    relation: 'state',
-                    scope: {
-                        fields: ['name'],
-                    },
-                },
-            },
-        },
-    ],
-};
-
 const from = Date.vnNew();
 const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
@@ -55,14 +29,6 @@ const userParams = {
     to: toDateString(to),
 };
 
-function stateColor(row) {
-    if (row.alertLevelCode === 'OK') return 'green';
-    if (row.alertLevelCode === 'FREE') return 'blue-3';
-    if (row.alertLevel === 1) return 'orange';
-    if (row.alertLevel === 0) return 'red';
-    return 'red';
-}
-
 function navigate(id) {
     router.push({ path: `/ticket/${id}` });
 }
@@ -112,111 +78,55 @@ function viewSummary(id) {
             <VnPaginate
                 data-key="TicketList"
                 url="Tickets/filter"
-                :filter="filter"
                 :user-params="userParams"
                 order="id DESC"
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QCard class="card q-mb-md" v-for="row of rows" :key="row.id">
-                        <QItem
-                            class="q-pa-none items-start cursor-pointer q-hoverable"
-                            v-ripple
-                            clickable
-                        >
-                            <QItemSection class="q-pa-md" @click="navigate(row.id)">
-                                <div class="text-h6">{{ row.name }}</div>
-                                <QItemLabel caption>#{{ row.id }}</QItemLabel>
-                                <QList>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('ticket.list.nickname') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.nickname }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('ticket.list.state') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                <QBadge
-                                                    :color="stateColor(row)"
-                                                    class="q-ma-none"
-                                                    dense
-                                                >
-                                                    {{ row.state }}
-                                                </QBadge>
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('ticket.list.shipped') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toDate(row.shipped) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('Zone') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.zoneName }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('ticket.list.salesPerson') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.salesPerson }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('ticket.list.total') }}
-                                            </QItemLabel>
-                                            <QItemLabel>
-                                                {{ toCurrency(row.totalWithVat) }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QItemSection>
-                            <QSeparator vertical />
-                            <QCardActions vertical class="justify-between">
-                                <QBtn
-                                    flat
-                                    round
-                                    color="orange"
-                                    icon="arrow_circle_right"
-                                    @click="navigate(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openCard') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    color="grey-7"
-                                    icon="preview"
-                                    @click="viewSummary(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openSummary') }}
-                                    </QTooltip>
-                                </QBtn>
-                            </QCardActions>
-                        </QItem>
-                    </QCard>
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :id="row.id"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('ticket.list.nickname')"
+                                :value="row.nickname"
+                            />
+                            <VnLv :label="t('ticket.list.state')">
+                                <template #value>
+                                    <QBadge
+                                        :color="row.classColor ?? 'orange'"
+                                        class="q-ma-none"
+                                        dense
+                                    >
+                                        {{ row.state }}
+                                    </QBadge>
+                                </template>
+                            </VnLv>
+                            <VnLv
+                                :label="t('ticket.list.shipped')"
+                                :value="toDate(row.shipped)"
+                            />
+                            <VnLv :label="t('Zone')" :value="row.zoneName" />
+                            <VnLv
+                                :label="t('ticket.list.salesPerson')"
+                                :value="row.salesPerson"
+                            />
+                            <VnLv
+                                :label="t('ticket.list.total')"
+                                :value="toCurrency(row.totalWithVat)"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
+                                <QTooltip>
+                                    {{ t('components.smartCard.openSummary') }}
+                                </QTooltip>
+                            </QBtn>
+                        </template>
+                    </CardList>
                 </template>
             </VnPaginate>
         </div>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3b34d8b6f..ba64a5abb 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -4,7 +4,8 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 const $props = defineProps({
     id: {
         type: Number,
@@ -52,19 +53,29 @@ function getWorkerAvatar() {
     const token = getToken();
     return `/api/Images/user/160x160/${route.params.id}/download?access_token=${token}`;
 }
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.user.nickname, entity.id));
 </script>
 <template>
     <CardDescriptor
         module="Worker"
         :url="`Workers/${entityId}`"
         :filter="filter"
-        @on-fetch="(data) => (worker = data)"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="
+            (data) => {
+                worker = data;
+                setData(data);
+            }
+        "
     >
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
                 <template #error>
                     <div
-                        class="absolute-full bg-grey-10 text-center q-pa-md flex flex-center"
+                        class="absolute-full picture text-center q-pa-md flex flex-center"
                     >
                         <div>
                             <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
@@ -78,55 +89,15 @@ function getWorkerAvatar() {
                 </template>
             </QImg>
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.user.nickname }}
-                <QTooltip>{{ entity.user.nickname }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption> {{ t('worker.card.name') }} </QItemLabel>
-                        <QItemLabel>{{ entity.user.nickname }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.email') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.user.email }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.list.department') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.department.department.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.phone') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.phone }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption
-                            >{{ t('worker.summary.sipExtension') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ sip }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('worker.card.name')" :value="entity.user.nickname" />
+            <VnLv :label="t('worker.card.email')" :value="entity.user.email"> </VnLv>
+            <VnLv
+                :label="t('worker.list.department')"
+                :value="entity.department ? entity.department.department.name : null"
+            />
+            <VnLv :label="t('worker.card.phone')" :value="entity.phone" />
+            <VnLv :label="t('worker.summary.sipExtension')" :value="sip" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 7fc4802c6..05ccdc373 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -3,11 +3,11 @@ import axios from 'axios';
 import { ref, onMounted, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from './WorkerDescriptorProxy.vue';
-
-onMounted(() => fetch());
-onUpdated(() => fetch());
+import { dashIfEmpty } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -20,8 +20,11 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
+const workerUrl = ref();
 
-const worker = ref(null);
+onMounted(async () => {
+    workerUrl.value = (await getUrl('')) + `worker/${entityId.value}/`;
+});
 
 const filter = {
     include: [
@@ -59,230 +62,59 @@ const filter = {
         },
     ],
 };
-
-function fetch() {
-    const id = entityId.value;
-    axios.get(`/Workers/${id}`, { params: { filter } }).then((response) => {
-        worker.value = response.data;
-    });
-}
-
-function sipExtension() {
-    if (worker.value.sip) return worker.value.sip.extension;
-    return '-';
-}
 </script>
 
 <template>
-    <div class="summary container">
-        <QCard>
-            <SkeletonSummary v-if="!worker" />
-            <template v-if="worker">
-                <div class="header bg-primary q-pa-sm q-mb-md">
-                    {{ worker.id }} - {{ worker.firstName }} {{ worker.lastName }}
-                </div>
-                <div class="row q-pa-md q-col-gutter-md q-mb-md">
-                    <div class="col">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('worker.summary.basicData') }}
-                            </QItemLabel>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption> ID </QItemLabel>
-                                    <QItemLabel>{{ worker.id }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.card.name') }}
-                                    </QItemLabel>
-                                    <QItemLabel>
-                                        {{ worker.user.nickname }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.list.department') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{
-                                        worker.department.department.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.list.email') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{ worker.user.email }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem
-                                class="items-start cursor-pointer q-hoverable"
+    <CardSummary ref="summary" :url="`Workers/${entityId}`" :filter="filter">
+        <template #header="{ entity }">
+            <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
+        </template>
+        <template #body="{ entity: worker }">
+            <QCard class="vn-one">
+                <a class="header" :href="workerUrl + `basic-data`">
+                    {{ t('worker.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
+                <VnLv
+                    :label="t('worker.list.department')"
+                    :value="worker.department.department.name"
+                />
+                <VnLv :label="t('worker.list.email')" :value="worker.user.email" />
+                <VnLv :label="t('worker.summary.boss')" link>
+                    <template #value>
+                        <span class="link">
+                            {{ dashIfEmpty(worker.boss?.name) }}
+                            <WorkerDescriptorProxy
+                                :id="worker.bossFk"
                                 v-if="worker.boss"
-                            >
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t('worker.summary.boss') }}
-                                    </QItemLabel>
-                                    <QItemLabel>
-                                        <span class="link">
-                                            {{ worker.boss.name }}
-                                            <WorkerDescriptorProxy :id="worker.bossFk" />
-                                        </span>
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.summary.phoneExtension') }}
-                                    </QItemLabel>
-                                    <QItemLabel>
-                                        {{
-                                            worker.mobileExtension == ''
-                                                ? worker.mobileExtension
-                                                : '-'
-                                        }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.summary.entPhone') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{
-                                        worker.phone == '' ? worker.phone : '-'
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.summary.personalPhone') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{
-                                        worker.client.phone == ''
-                                            ? worker.client.phone
-                                            : '-'
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
-                    <div class="col">
-                        <QList>
-                            <QItemLabel header class="text-h6">
-                                {{ t('worker.summary.userData') }}
-                            </QItemLabel>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t('worker.summary.userId') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{ worker.user.id }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.card.name') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{ worker.user.nickname }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.summary.role') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{ worker.user.role.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption
-                                        >{{ t('worker.summary.sipExtension') }}
-                                    </QItemLabel>
-                                    <QItemLabel>{{ sipExtension() }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </div>
+                            />
+                        </span>
+                    </template>
+                </VnLv>
+                <VnLv
+                    :label="t('worker.summary.phoneExtension')"
+                    :value="worker.mobileExtension"
+                />
+                <VnLv :label="t('worker.summary.entPhone')" :value="worker.phone" />
+                <VnLv
+                    :label="t('worker.summary.personalPhone')"
+                    :value="worker.client.phone"
+                />
+                <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
+            </QCard>
+            <QCard class="vn-one">
+                <div class="header">
+                    {{ t('worker.summary.userData') }}
                 </div>
-            </template>
-        </QCard>
-    </div>
+                <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />
+                <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
+                <VnLv :label="t('worker.summary.role')" :value="worker.user.role.name" />
+                <VnLv
+                    :label="t('worker.summary.sipExtension')"
+                    :value="worker?.sip?.extension"
+                />
+            </QCard>
+        </template>
+    </CardSummary>
 </template>
-<style lang="scss" scoped>
-.avatar {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    margin-right: 10px;
-}
-
-.container {
-    display: flex;
-    justify-content: center;
-}
-
-.q-card {
-    width: 100%;
-    max-width: 1200px;
-}
-
-.negative {
-    color: red;
-}
-
-.summary {
-    .q-list {
-        .q-item__label--header {
-            display: flex;
-            justify-content: space-between;
-
-            a {
-                color: $primary;
-            }
-        }
-    }
-    .row {
-        flex-wrap: wrap;
-
-        .col {
-            min-width: 250px;
-        }
-    }
-
-    .header {
-        text-align: center;
-        font-size: 18px;
-    }
-
-    #slider-container {
-        max-width: 80%;
-        margin: 0 auto;
-
-        .q-slider {
-            .q-slider__marker-labels:nth-child(1) {
-                transform: none;
-            }
-            .q-slider__marker-labels:nth-child(2) {
-                transform: none;
-                left: auto !important;
-                right: 0%;
-            }
-        }
-    }
-}
-
-.q-dialog .summary {
-    max-width: 1200px;
-}
-</style>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 15df7373a..cb75cdee3 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -7,6 +7,8 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import WorkerSummaryDialog from './Card/WorkerSummaryDialog.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import WorkerFilter from './WorkerFilter.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -66,73 +68,38 @@ function viewSummary(id) {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QCard class="card q-mb-md" v-for="row of rows" :key="row.id">
-                        <QItem
-                            class="q-pa-none items-start cursor-pointer q-hoverable"
-                            v-ripple
-                            clickable
-                        >
-                            <QItemSection class="q-pa-md" @click="navigate(row.id)">
-                                <QItemLabel class="text-h6">
-                                    {{ row.nickname }}
-                                </QItemLabel>
-                                <QItemLabel caption>#{{ row.id }}</QItemLabel>
-                                <QList>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('worker.list.name') }}
-                                            </QItemLabel>
-                                            <QItemLabel>{{ row.userName }}</QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>
-                                                {{ t('worker.list.email') }}
-                                            </QItemLabel>
-                                            <QItemLabel>{{ row.email }}</QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                    <QItem class="q-pa-none">
-                                        <QItemSection>
-                                            <QItemLabel caption>{{
-                                                t('worker.list.department')
-                                            }}</QItemLabel>
-                                            <QItemLabel>
-                                                {{ row.department }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </QList>
-                            </QItemSection>
-                            <QSeparator vertical />
-                            <QCardActions vertical class="justify-between">
-                                <QBtn
-                                    flat
-                                    round
-                                    color="primary"
-                                    icon="arrow_circle_right"
-                                    @click="navigate(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openCard') }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    color="grey-7"
-                                    icon="preview"
-                                    @click="viewSummary(row.id)"
-                                >
-                                    <QTooltip>
-                                        {{ t('components.smartCard.openSummary') }}
-                                    </QTooltip>
-                                </QBtn>
-                            </QCardActions>
-                        </QItem>
-                    </QCard>
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        @click="navigate(row.id)"
+                        :title="row.nickname"
+                    >
+                        <template #list-items>
+                            <VnLv label="ID" :value="row.id" />
+                            <VnLv :label="t('worker.list.name')" :value="row.userName" />
+                            <VnLv :label="t('worker.list.email')" :value="row.email" />
+                            <VnLv
+                                :label="t('worker.list.department')"
+                                :value="row.department"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                flat
+                                icon="arrow_circle_right"
+                                @click.stop="navigate(row.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('components.smartCard.openCard') }}
+                                </QTooltip>
+                            </QBtn>
+                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
+                                <QTooltip>
+                                    {{ t('components.smartCard.openSummary') }}
+                                </QTooltip>
+                            </QBtn>
+                        </template>
+                    </CardList>
                 </template>
             </VnPaginate>
         </div>
diff --git a/src/router/index.js b/src/router/index.js
index 9bc199047..cccf9af6d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,8 +45,8 @@ export { Router };
 export default route(function (/* { store, ssrContext } */) {
     Router.beforeEach(async (to, from, next) => {
         const { isLoggedIn } = session;
-
-        if (!isLoggedIn() && to.name !== 'Login') {
+        const outLayout = ['Login', 'TwoFactor'];
+        if (!isLoggedIn() && !outLayout.includes(to.name)) {
             return next({ name: 'Login', query: { redirect: to.fullPath } });
         }
 
diff --git a/src/router/routes.js b/src/router/routes.js
index 08491e475..4425996b0 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,9 +9,21 @@ import route from './modules/route';
 const routes = [
     {
         path: '/login',
-        name: 'Login',
-        meta: { title: 'logIn' },
-        component: () => import('../pages/Login/LoginMain.vue'),
+        component: () => import('../layouts/OutLayout.vue'),
+        children: [
+            {
+                path: '',
+                name: 'Login',
+                meta: { title: 'logIn' },
+                component: () => import('../pages/Login/LoginMain.vue'),
+            },
+            {
+                path: '/twoFactor',
+                name: 'TwoFactor',
+                meta: { title: 'twoFactor' },
+                component: () => import('../pages/Login/TwoFactor.vue'),
+            },
+        ],
     },
     {
         path: '/',
@@ -37,7 +49,7 @@ const routes = [
                 component: () => import('../pages/NotFound.vue'),
             },
             wagon,
-            route
+            route,
         ],
     },
 ];
diff --git a/test/cypress/integration/login.spec.js b/test/cypress/integration/login.spec.js
index 4cf10f226..f8a9f5c64 100755
--- a/test/cypress/integration/login.spec.js
+++ b/test/cypress/integration/login.spec.js
@@ -3,28 +3,37 @@ describe('Login', () => {
     beforeEach(() => {
         cy.visit('/#/login');
         cy.get('#switchLanguage').click();
-        cy.get('div.q-menu div.q-item:nth-child(1)').click();
+        cy.get('.q-menu > :nth-child(1) > .q-item').click();
     });
 
     it('should fail to log in using wrong user', () => {
         cy.get('input[aria-label="Username"]').type('incorrectUser');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Invalid username or password');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Invalid username or password'
+        );
     });
 
     it('should fail to log in using wrong password', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('wrongPassword');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Invalid username or password');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Invalid username or password'
+        );
     });
 
     it('should log in', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'You have successfully logged in');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'You have successfully logged in'
+        );
         cy.url().should('contain', '/dashboard');
     });
 
@@ -32,7 +41,10 @@ describe('Login', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'You have successfully logged in');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'You have successfully logged in'
+        );
         cy.url().should('contain', '/dashboard');
         cy.get('#user').click();
         cy.get('#logout').click();
diff --git a/test/cypress/integration/workerList.spec.js b/test/cypress/integration/workerList.spec.js
index 79f2400bf..7a6c1d84d 100644
--- a/test/cypress/integration/workerList.spec.js
+++ b/test/cypress/integration/workerList.spec.js
@@ -6,18 +6,21 @@ describe('WorkerList', () => {
     });
 
     it('should load workers', () => {
-        cy.get('div[class="q-item__label text-h6"]').eq(0).should('have.text', 'Jessica Jones');
-        cy.get('div[class="q-item__label text-h6"]').eq(1).should('have.text', 'Bruce Banner');
-        cy.get('div[class="q-item__label text-h6"]').eq(2).should('have.text', 'Charles Xavier');
+        cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
+            .eq(0)
+            .should('have.text', 'JessicaJones');
+        cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
+            .eq(1)
+            .should('have.text', 'BruceBanner');
+        cy.get('.list-items > .vn-label-value:nth-child(2) > .value')
+            .eq(2)
+            .should('have.text', 'CharlesXavier');
     });
 
     it('should open the worker summary', () => {
-        cy.get('div.text-h6')
-            .parentsUntil('div.q-card')
-            .find('div.q-card__actions')
-            .find('button').first().click();
-        cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '1110 - Jessica Jones');
-        cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(0).should('have.text', 'Basic data');
-        cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(1).should('have.text', 'User data');
+        cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(0).click();
+        cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
+        cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data');
+        cy.get('.summary .header').eq(1).should('have.text', 'User data');
     });
 });
diff --git a/test/cypress/integration/workerNotificationsManager.spec.js b/test/cypress/integration/workerNotificationsManager.spec.js
index 6c5aa21fb..4cd54629a 100644
--- a/test/cypress/integration/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/workerNotificationsManager.spec.js
@@ -1,4 +1,4 @@
-describe('WorkerNotificationsManager', () => {
+xdescribe('WorkerNotificationsManager', () => {
     beforeEach(() => {
         const workerId = 1110;
         cy.viewport(1280, 720);
@@ -9,16 +9,25 @@ describe('WorkerNotificationsManager', () => {
     it('should unsubscribe 2 notifications, check the unsubscription has been saved, subscribe to other one and should check the data has been saved', () => {
         cy.get('.q-chip').should('have.length', 3);
         cy.get('.q-toggle__thumb').eq(0).click();
-        cy.get('.q-notification__message').should('have.text', 'Unsubscribed from the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Unsubscribed from the notification'
+        );
         cy.get('.q-chip > .q-icon').eq(0).click();
 
         cy.reload();
 
         cy.get('.q-chip').should('have.length', 1);
         cy.get('.q-toggle__thumb').should('have.length', 3).eq(0).click();
-        cy.get('.q-notification__message').should('have.text', 'Subscribed to the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Subscribed to the notification'
+        );
         cy.get('.q-toggle__thumb').should('have.length', 3).eq(1).click();
-        cy.get('.q-notification__message').should('have.text', 'Subscribed to the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Subscribed to the notification'
+        );
 
         cy.reload();
 
diff --git a/test/cypress/integration/workerSummary.spec.js b/test/cypress/integration/workerSummary.spec.js
index cef26d061..7228b4b31 100644
--- a/test/cypress/integration/workerSummary.spec.js
+++ b/test/cypress/integration/workerSummary.spec.js
@@ -1,15 +1,15 @@
 describe('WorkerSummary', () => {
     beforeEach(() => {
-        cy.viewport(1280, 720)
-        cy.login('developer')
+        cy.viewport(1280, 720);
+        cy.login('developer');
         cy.visit('/#/worker/19/summary');
     });
 
     it('should load worker summary', () => {
-        cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '19 - salesBoss salesBoss');
-        cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(0).should('have.text', 'Basic data');
-        cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(1).should('have.text', 'User data');
-        cy.get('div[class="q-item__section column q-item__section--main justify-center"]').eq(0).should('have.text', 'NamesalesBossNick');
+        cy.get('.summaryHeader > div').should('have.text', '19 - salesBoss salesBoss');
+        cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
+            'have.text',
+            'salesBossNick'
+        );
     });
-
 });