diff --git a/src/api/zeroPrices.js b/src/api/zeroPrices.js
deleted file mode 100644
index a7db41a..0000000
--- a/src/api/zeroPrices.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { apiClient } from '@/services/apiClient.js'
-
-export const useZeroPrices = () => {
-  const getZeroPrices = async () => {
-    try {
-      return await apiClient.get('/merch/zeroprices')
-    } catch (error) {
-      console.log('Get zero prices error: ', error)
-      throw error
-    }
-  }
-
-  const deleteZeroPrices = async (list) => {
-    try {
-      await apiClient.delete('/merch/zeroprices', list)
-    }
-    catch (error) {
-      console.log('Delete target zero prices error: ', error)
-      throw error
-    }
-  }
-
-  const deleteZeroPricesPeriod = async (start, end) => {
-    const params = new URLSearchParams({ start, end }).toString()
-    const url = `/merch/zeroprices/period${params ? `?${params}` : ''}`
-    const response = await apiClient.delete(url)
-
-    if (response.status === 200) {
-      return response
-    } else {
-      console.log('Delete period select zero prices error: ', response)
-    }
-  }
-
-  return {
-    getZeroPrices,
-    deleteZeroPrices,
-    deleteZeroPricesPeriod,
-  }
-}
diff --git a/src/components/ChartBlock.vue b/src/components/ChartBlock.vue
index 11bd874..96a5243 100644
--- a/src/components/ChartBlock.vue
+++ b/src/components/ChartBlock.vue
@@ -13,7 +13,6 @@ import {
 } from 'chart.js'
 import { Line } from 'vue-chartjs'
 import 'chartjs-adapter-date-fns'
-import { originColors } from '@/services/colors.js'
 
 ChartJS.register(
   Title,
@@ -34,6 +33,11 @@ const props = defineProps({
   },
 })
 
+const originColors = {
+  surugaya: '#2d3081',
+  mandarake: '#924646',
+}
+
 const chartData = ref({
   datasets: [],
 })
diff --git a/src/components/CopyToClipboard.vue b/src/components/CopyToClipboard.vue
index c8cebd7..0100e5f 100644
--- a/src/components/CopyToClipboard.vue
+++ b/src/components/CopyToClipboard.vue
@@ -6,7 +6,7 @@ const message = useMessage()
 const props = defineProps({
   text: {
     type: String,
-    default: '',
+    required: true,
   },
 })
 
diff --git a/src/components/LabelDotTemplate.vue b/src/components/LabelDotTemplate.vue
deleted file mode 100644
index c37db3f..0000000
--- a/src/components/LabelDotTemplate.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script setup>
-const props = defineProps({
-  color: {
-    type: String,
-    default: '#EF2D56FF'
-  },
-  bg_color: {
-    type: String,
-    default: '#FFFFFF'
-  }
-})
-</script>
-
-<template>
-  <span class="color-dot" :style="{ borderColor: color, backgroundColor: bg_color }"></span>
-</template>
-
-<style scoped>
-.color-dot {
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  border: 1px solid; /* чтобы border-color работал */
-  vertical-align: middle;
-}
-</style>
diff --git a/src/components/LabelTemplate.vue b/src/components/LabelTemplate.vue
deleted file mode 100644
index f26f669..0000000
--- a/src/components/LabelTemplate.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script setup>
-const props = defineProps({
-  text: {
-    type: String,
-    required: true,
-    default: 'label'
-  },
-  color: {
-    type: String,
-    default: '#EF2D56FF'
-  },
-  bg_color: {
-    type: String,
-    default: '#FFFFFF'
-  }
-})
-</script>
-
-<template>
-  <label class="custom_label"
-         :style="{color: color, backgroundColor: bg_color, borderColor: color}"
-  >
-    {{ text }}
-  </label>
-</template>
-
-<style scoped>
-.custom_label {
-  font-family: 'Heebo', sans-serif;
-  font-size: 0.75rem;
-  font-weight: 500;
-  letter-spacing: 0.025rem;
-  font-style: normal;
-  text-transform: uppercase;
-  border-radius: 1.25rem;
-  -webkit-border-radius: 1.25rem;
-  -moz-border-radius: 1.25rem;
-  padding: 0.35rem 0.75rem;
-  border-style: solid;
-  border-width: 0.125rem;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  -box-shadow: none;
-}
-</style>
diff --git a/src/components/ManageLabels.vue b/src/components/ManageLabels.vue
deleted file mode 100644
index 6d57f82..0000000
--- a/src/components/ManageLabels.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <n-button type="primary">
-    <router-link :to="{ name: 'labels' }" class="router-link-button">
-      Manage labels
-    </router-link>
-  </n-button>
-</template>
diff --git a/src/components/Navbar/NavBar.vue b/src/components/Navbar/NavBar.vue
index a05c67c..d8774fb 100644
--- a/src/components/Navbar/NavBar.vue
+++ b/src/components/Navbar/NavBar.vue
@@ -17,7 +17,6 @@ const mainMenu = computed(() => {
     { label: 'Collection', key: 'collection' },
     { label: 'Charts', key: 'charts' },
     { label: 'Parsers', key: 'parsers' },
-    { label: 'Zero prices', key: 'zeroprices' },
   ]
 })
 
@@ -29,7 +28,6 @@ const authMenu = computed(() => {
   }
 
   return [
-    { label: 'Labels', key: 'labels' },
     { label: 'Personal', key: 'personal' },
   ]
 })
@@ -139,7 +137,7 @@ const renderLabel = (option) => {
   display: flex;
   align-items: center;
   margin-left: auto;
-  min-width: 250px;
+  min-width: 150px;
   padding-right: 16px;
   box-sizing: border-box;
 }
diff --git a/src/main.js b/src/main.js
index 6561fbf..ee40f96 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,6 @@ export const BASE_URL = 'https://api.nqws.ru/api/v2'
 // export const BASE_URL = 'http://localhost:9090/api/v2'
 
 export const BASE_MANDARAKE_LINK = 'https://order.mandarake.co.jp/order/listPage/list?soldOut=1&keyword='
-export const BASE_AMIAMI_LINK = 'https://slist.amiami.jp/top/search/list?s_cate_tag=1&submit_btn=&s_st_list_preorder_available=1&s_st_list_backorder_available=1&s_st_list_newitem_available=1&s_st_condition_flg=1&pagemax=60&s_keywords='
 // export const IMAGE_STORAGE_URL = 'http://localhost:9280'
 export const IMAGE_STORAGE_URL = 'https://images.nqws.ru'
 
diff --git a/src/router/index.js b/src/router/index.js
index 0a0ff85..53e4751 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,8 +7,6 @@ import ParsersView from '@/views/ParsersView.vue'
 import PersonalView from '@/views/PersonalView.vue'
 import AddMerchView from '@/views/AddMerchView.vue'
 import DetailsView from '@/views/DetailsView.vue'
-import LabelsView from '@/views/LabelsView.vue'
-import ZeroPricesView from '@/views/ZeroPricesView.vue'
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -54,16 +52,6 @@ const router = createRouter({
       component: DetailsView,
       props: true,
     },
-    {
-      path: '/labels',
-      name: 'labels',
-      component: LabelsView,
-    },
-    {
-      path: '/zeroprices',
-      name: 'zeroprices',
-      component: ZeroPricesView,
-    },
   ],
 })
 
diff --git a/src/services/apiClient.js b/src/services/apiClient.js
index 639fb84..60d5d46 100644
--- a/src/services/apiClient.js
+++ b/src/services/apiClient.js
@@ -6,25 +6,23 @@ let isRefreshing = false
 let refreshPromise = null
 
 function createConfig(options = {}) {
-  const token = localStorage.getItem('accessToken');
-  const isFormData = options.body instanceof FormData;
-
+  const authStore = useAuthStore()
   const headers = {
-    ...(isFormData ? {} : { 'Content-Type': 'application/json' }),
+    'Content-Type': 'application/json',
     ...options.headers,
-  };
+  }
 
-  if (token) {
-    headers['Authorization'] = `Bearer ${token}`;
+  if (authStore.accessToken) {
+    headers['Authorization'] = `Bearer ${authStore.accessToken}`
   }
 
   return {
     headers,
+    credentials: 'include',
     ...options,
-  };
+  }
 }
 
-
 async function refreshAccessToken() {
   const authStore = useAuthStore()
 
@@ -55,8 +53,7 @@ async function refreshAccessToken() {
     })
 
     .catch((error) => {
-      console.error('Refresh error:', error)
-      throw new Error('REFRESH_FAILED')
+      throw error
     })
 
     .finally(() => {
@@ -69,32 +66,29 @@ async function refreshAccessToken() {
 
 async function request(url, options = {}, isRetry = false) {
   const config = createConfig(options)
+
   const response = await fetch(`${BASE_URL}${url}`, config)
 
   if (response.status === 401 && !isRetry) {
     try {
       const data = await refreshAccessToken()
-      const token = data.access_token
-      if (!token) throw new Error('Refresh response did not contain access_token')
 
+      const token = data.access_token
+      if (!token) {
+        throw new Error('Refresh response did not contain access_token')
+      }
 
       const newOptions = {
         ...options,
         headers: {
           ...options.headers,
-          Authorization: `Bearer ${token}`,
+          'Authorization': `Bearer ${token}`,
         },
       }
-
       return await request(url, newOptions, true)
     } catch (e) {
-      if (e.message === 'REFRESH_FAILED') {
-        const authStore = useAuthStore()
-        authStore.forceLogout()
-        console.warn('Force logout (refresh failed)', url)
-      } else {
-        console.error('Unexpected error during refresh', e)
-      }
+      const authStore = useAuthStore()
+      authStore.forceLogout()
       throw e
     }
   }
@@ -106,15 +100,9 @@ async function request(url, options = {}, isRetry = false) {
     } catch {
       errorData = {}
     }
-
-    return {
-      status: response.status,
-      ok: false,
-      error: errorData.message || `HTTP Error: ${response.status}`,
-    }
+    throw new Error(errorData.message || `HTTP Error: ${response.status}`)
   }
 
-
   let data = null
   const contentType = response.headers.get('content-type')
   if (contentType?.includes('application/json')) {
@@ -125,7 +113,11 @@ async function request(url, options = {}, isRetry = false) {
     }
   }
 
-  return { status: response.status, ok: response.ok, data }
+  return {
+    status: response.status,
+    ok: response.ok,
+    data,
+  }
 }
 
 export const apiClient = {
@@ -140,14 +132,14 @@ export const apiClient = {
     return request(url, {
       method: 'POST',
       body: isFormData ? data : JSON.stringify(data),
+      headers: isFormData
+        ? {}
+        : { 'Content-Type': 'application/json' }
     })
   },
   put: (url, data) => request(url, {
     method: 'PUT',
     body: JSON.stringify(data),
   }),
-  delete: (url, data) => request(url, {
-    method: 'DELETE',
-    body: data ? JSON.stringify(data) : undefined,
-  }),
+  delete: (url) => request(url, { method: 'DELETE' }),
 }
diff --git a/src/services/colors.js b/src/services/colors.js
deleted file mode 100644
index 26e0b5e..0000000
--- a/src/services/colors.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const originColors = {
-  surugaya: '#2d3081',
-  mandarake: '#924646',
-  amiami: '#F27024',
-};
diff --git a/src/stores/authStore.js b/src/stores/authStore.js
index 977cd25..7cdfc82 100644
--- a/src/stores/authStore.js
+++ b/src/stores/authStore.js
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { computed, nextTick, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { apiClient } from '@/services/apiClient'
 import router from '@/router/index.js'
 
@@ -54,11 +54,9 @@ export const useAuthStore = defineStore('auth', () => {
     try {
       const response = await apiClient.post('/user/auth/login', { email, password })
       setToken(response.data.access_token)
-      await nextTick()
       router.push({ name: 'collection'})
     } catch (error) {
       console.error('Login error:', error)
-      throw error
     }
   }
 
diff --git a/src/stores/labelsStore.js b/src/stores/labelsStore.js
deleted file mode 100644
index ab8ef28..0000000
--- a/src/stores/labelsStore.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import { defineStore } from 'pinia'
-import { apiClient } from '@/services/apiClient.js'
-import { ref } from 'vue'
-
-function safeParseJSON(str, fallback = []) {
-  if (str === null || str === undefined || str === 'null' || str === '') {
-    return fallback
-  }
-  try {
-    const parsed = JSON.parse(str)
-    return Array.isArray(parsed) ? parsed : fallback
-  } catch (e) {
-    console.warn('Failed to parse localStorage item "labels", using fallback:', e)
-    return fallback
-  }
-}
-
-export const useLabelsStore = defineStore('labels', () => {
-  //state
-  const labels = ref(safeParseJSON(localStorage.getItem('labels'), []))
-
-  //getters
-
-  //action
-  const createLabel = async (newLabel) => {
-    try {
-      await apiClient.post('/merch/labels', newLabel)
-      await getLabels()
-    } catch (error) {
-      console.error('Failed to create label:', error)
-      throw error
-    }
-  }
-
-  const getLabels = async () => {
-    try {
-      const response = await apiClient.get(`/merch/labels?_=${Date.now()}`)
-      const labelList = Array.isArray(response.data) ? response.data : []
-      labels.value = labelList
-      localStorage.setItem('labels', JSON.stringify(labelList))
-    } catch (error) {
-      console.error('Failed to fetch labels:', error)
-      labels.value = []
-    }
-  }
-
-  const updateLabel = async (uuid, updatedData) => {
-    try {
-      await apiClient.put(`/merch/labels/${uuid}?_=${Date.now()}`, updatedData)
-      await getLabels()
-    } catch (error) {
-      console.error('Failed to update label:', error)
-      throw error
-    }
-  }
-
-  const deleteLabel = async (uuid) => {
-    try {
-      await apiClient.delete(`/merch/labels/${uuid}`)
-      await getLabels()
-    } catch (error) {
-      console.error('Failed to delete label:', error)
-      throw error
-    }
-  }
-
-  const attachLabel = async (merchUuid, labelUuid) => {
-    try {
-      const payload = { merch_uuid: merchUuid, label_uuid: labelUuid }
-      await apiClient.post('/merch/labels/attach', payload)
-    } catch (error) {
-      console.error('Failed to attach label:', error)
-      throw error
-    }
-  }
-
-  const detachLabel = async (merchUuid, labelUuid) => {
-    try {
-      const payload = { merch_uuid: merchUuid, label_uuid: labelUuid }
-      await apiClient.post('/merch/labels/detach', payload)
-    } catch (error) {
-      console.error('Failed to detach label:', error)
-      throw error
-    }
-  }
-
-  const getMerchLabels = async (merchUuid) => {
-    try {
-      const response = await apiClient.get(`/merch/labels/${merchUuid}`)
-      return response
-    } catch (error) {
-      console.error('Failed to get merch labels:', error)
-      throw error
-    }
-  }
-
-  return {
-    labels,
-    createLabel,
-    getLabels,
-    updateLabel,
-    deleteLabel,
-    attachLabel,
-    detachLabel,
-    getMerchLabels,
-  }
-})
diff --git a/src/styles/styles.css b/src/styles/styles.css
index 815f71a..8219206 100644
--- a/src/styles/styles.css
+++ b/src/styles/styles.css
@@ -2,10 +2,6 @@
   margin-top: 10px;
 }
 
-.mt-20 {
-  margin-top: 20px;
-}
-
 .mb-10 {
   margin-bottom: 10px;
 }
@@ -170,35 +166,3 @@ body,
   max-height: 70vh;
   object-fit: contain;
 }
-
-.router-link-button{
-  color: inherit;
-  text-decoration: none;
-}
-
-.label-container {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.label-column {
-  display: flex;
-  flex-direction: column;
-}
-
-.label-row {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.label-preview {
-  justify-content: center;
-  margin-bottom: 20px;
-}
-
-.padding-lr-30 {
-  padding-left: 30px;
-  padding-right: 30px;
-}
diff --git a/src/views/ChartsView.vue b/src/views/ChartsView.vue
index 9eaa92c..d86e6d4 100644
--- a/src/views/ChartsView.vue
+++ b/src/views/ChartsView.vue
@@ -33,7 +33,7 @@ const fetchPrices = async (days = 7) => {
 }
 
 onMounted(() => {
-  fetchPrices()
+  fetchPrices(7)
 })
 
 function handleSelectDays(days) {
diff --git a/src/views/CollectionView.vue b/src/views/CollectionView.vue
index 52818c0..d3fc1a5 100644
--- a/src/views/CollectionView.vue
+++ b/src/views/CollectionView.vue
@@ -4,14 +4,12 @@ import CollectionMerchCard from '@/views/CollectionView/CollectionMerchCard.vue'
 import { computed, onMounted, ref } from 'vue'
 import { useMerchApi } from '@/api/merch.js'
 import ScrollToTopButton from '@/components/ScrollToTopButton.vue'
-import { useLabelsStore } from '@/stores/labelsStore'
 
 const merchList = ref(null)
 const loading = ref(true)
 const error = ref(null)
 
 const { getMerchList } = useMerchApi()
-const { getLabels } = useLabelsStore()
 
 const fetchMerch = async () => {
   try {
@@ -27,39 +25,27 @@ const fetchMerch = async () => {
 
 onMounted(() => {
   fetchMerch()
-  getLabels()
 })
 
 const searchQuery = ref('')
-const selectedLabelUuids = ref([])
 
 const filteredMerch = computed(() => {
-  let result = merchList.value || []
-
-  if (searchQuery.value.trim()) {
-    const q = searchQuery.value.toLowerCase()
-    result = result.filter((item) => item.name.toLowerCase().includes(q))
+  if (!searchQuery.value.trim()) {
+    return merchList.value
   }
-
-  if (selectedLabelUuids.value.length > 0) {
-    const selectedSet = new Set(selectedLabelUuids.value)
-    result = result.filter((item) => {
-      return item.labels && item.labels.some((labelUuid) => selectedSet.has(labelUuid))
-    })
-  }
-
-  return result
+  const q = searchQuery.value.toLowerCase()
+  return merchList.value.filter((item) => item.name.toLowerCase().includes(q))
 })
 </script>
 
 <template>
   <div class="sticky-search-container">
-    <CollectionToolbar v-model="searchQuery" v-model:labelUuids="selectedLabelUuids" />
+    <CollectionToolbar v-model="searchQuery" />
   </div>
   <n-grid responsive="screen" cols="2 s:3 m:4 l:5 xl:6 2xl:7" class="grid-main">
     <n-gi class="grid-item" v-for="item in filteredMerch" :key="item.merch_uuid">
       <router-link :to="`/details/${item.merch_uuid}`" class="card-link">
-        <CollectionMerchCard :merch="item" :labels="item.labels" />
+        <CollectionMerchCard :merch="item" />
       </router-link>
     </n-gi>
   </n-grid>
diff --git a/src/views/CollectionView/CollectionMerchCard.vue b/src/views/CollectionView/CollectionMerchCard.vue
index c3ca223..bb90992 100644
--- a/src/views/CollectionView/CollectionMerchCard.vue
+++ b/src/views/CollectionView/CollectionMerchCard.vue
@@ -1,33 +1,14 @@
 <script setup>
 import BoxIcon from '@/components/icons/BoxIcon.vue'
 import { useMerchImagesApi } from '@/api/merchImages.js'
-import { computed, onMounted, ref } from 'vue'
-import LabelDotTemplate from '@/components/LabelDotTemplate.vue'
-import { useLabelsStore } from '@/stores/labelsStore.js'
+import { onMounted, ref } from 'vue'
 const { getImageUrl } = useMerchImagesApi()
 
 const props = defineProps({
   merch: {
     type: Object,
     required: true,
-  },
-  labels: {
-    type: Array,
-    default: () => [],
-  },
-})
-
-const store = useLabelsStore()
-
-const resolvedLabelDots = computed(() => {
-  const labelMap = new Map()
-  for (const label of store.labels) {
-    labelMap.set(label.label_uuid, label)
   }
-
-  return props.labels
-    .map(uuid => labelMap.get(uuid))
-    .filter(Boolean)
 })
 
 const fileList = ref([])
@@ -63,14 +44,6 @@ onMounted(async () => {
   <n-card class="responsive-card">
     <template #header>
       <h3 class="card-title">{{ merch.name }}</h3>
-      <div v-if="resolvedLabelDots.length > 0" class="label-dots">
-        <LabelDotTemplate
-          v-for="label in resolvedLabelDots"
-          :key="label.label_uuid"
-          :color="label.color"
-          :bg_color="label.bg_color"
-        />
-      </div>
     </template>
     <template #cover>
       <div class="cover-wrapper">
@@ -128,11 +101,4 @@ onMounted(async () => {
   height: auto;
   max-width: 80%;
 }
-
-.label-dots {
-  display: flex;
-  gap: 6px;
-  flex-wrap: wrap;
-  justify-content: right;
-}
 </style>
diff --git a/src/views/CollectionView/CollectionToolbar.vue b/src/views/CollectionView/CollectionToolbar.vue
index ebe8bc0..e2ac70d 100644
--- a/src/views/CollectionView/CollectionToolbar.vue
+++ b/src/views/CollectionView/CollectionToolbar.vue
@@ -1,58 +1,47 @@
 <script setup>
-import { computed } from 'vue'
+import { ref, watch } from 'vue'
 import router from '@/router/index.js'
-import { useLabelsStore } from '@/stores/labelsStore.js'
 
-const store = useLabelsStore()
+
+const value = ref(null)
+const options = [
+  { label: 'Placeholder 1', value: 'Placeholder 1' },
+  { label: 'Placeholder 2', value: 'Placeholder 2' },
+]
+
+const addMerch = () => {
+  router.push({ name: 'addMerch' })
+}
 
 const props = defineProps({
   modelValue: {
     type: String,
     default: '',
   },
-  labelUuids: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['update:modelValue', 'update:labelUuids'])
-
-const addMerch = () => {
-  router.push({ name: 'addMerch' })
-}
-
-const localSearch = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
 })
 
-const selectedLabelUuids = computed({
-  get() {
-    return props.labelUuids
-  },
-  set(value) {
-    emit('update:labelUuids', value)
-  },
-})
+const emit = defineEmits(['update:modelValue'])
 
-const labelOptions = computed(() => {
-  return store.labels.map((label) => ({
-    label: label.name,
-    value: label.label_uuid,
-  }))
+const localValue = ref(props.modelValue)
+
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    localValue.value = newVal
+  }
+)
+
+watch(localValue, (newVal) => {
+  emit('update:modelValue', newVal)
 })
 </script>
 
 <template>
   <div class="toolbar">
-    <n-button type="primary" class="toolbar-item" @click="addMerch"> Add merch</n-button>
+    <n-button type="primary" class="toolbar-item" @click="addMerch"> Add merch </n-button>
 
     <div class="search-wrapper toolbar-item">
-      <n-input v-model:value="localSearch" placeholder="Search..." clearable />
+      <n-input v-model:value="localValue" placeholder="Search..." clearable />
     </div>
 
     <div class="selector toolbar-item">
@@ -60,12 +49,13 @@ const labelOptions = computed(() => {
         placeholder="Select label"
         clearable
         multiple
-        v-model:value="selectedLabelUuids"
-        :options="labelOptions"
-        class="mobile-full-width"
-      />
+        v-model:value="value"
+        :options="options"
+        class="mobile-full-width" />
     </div>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+
+</style>
diff --git a/src/views/DetailsView.vue b/src/views/DetailsView.vue
index 5d7050b..95b27c0 100644
--- a/src/views/DetailsView.vue
+++ b/src/views/DetailsView.vue
@@ -5,9 +5,9 @@ import router from '@/router/index.js'
 import PeriodSelector from '@/components/PeriodSelector.vue'
 import ChartBlock from '@/components/ChartBlock.vue'
 import { useChartsApi } from '@/api/charts.js'
+import EditLink from '@/views/DetailsView/EditLink.vue'
+import CopyToClipboard from '@/components/CopyToClipboard.vue'
 import DetailsViewImages from '@/views/DetailsView/DetailsViewImages.vue'
-import AttachLabel from '@/views/DetailsView/AttachLabel.vue'
-import OriginBlock from '@/views/DetailsView/OriginBlock.vue'
 
 const { getMerchDetails, deleteMerch } = useMerchApi()
 const { getDistinctPrices } = useChartsApi()
@@ -19,6 +19,11 @@ const props = defineProps({
   },
 })
 
+const editing = ref({
+  surugaya: false,
+  mandarake: false,
+})
+
 const merchDetails = ref(null)
 const loading = ref(true)
 const error = ref(null)
@@ -29,7 +34,7 @@ const fetchMerch = async () => {
     merchDetails.value = response.data
 
     if (!response.status === 400) {
-      await router.push({ name: 'collection' })
+      router.push({ name: 'collection' })
     }
   } catch (err) {
     error.value = err.message
@@ -52,7 +57,7 @@ const confirmDelete = async () => {
     console.log(error)
   }
   showModal.value = false
-  await router.push({ name: 'collection' })
+  router.push({ name: 'collection' })
 }
 
 const prices = ref(null)
@@ -66,7 +71,7 @@ const fetchPrices = async (days = 7) => {
     const response = await getDistinctPrices(props.merch_uuid, days)
 
     if (response.status === 400) {
-      await router.push({ name: 'collection' })
+      router.push({ name: 'collection' })
       return
     }
 
@@ -78,6 +83,11 @@ const fetchPrices = async (days = 7) => {
   }
 }
 
+function handleLinkUpdate(origin, newLink) {
+  merchDetails.value[`origin_${origin}`].link = newLink
+  editing.value[origin] = false
+}
+
 function handleSelectDays(days) {
   fetchPrices(days)
 }
@@ -97,7 +107,6 @@ onMounted(() => {
       <div>
         <p><strong>Uuid:</strong> {{ merchDetails.merch_uuid }}</p>
         <p><strong>Name:</strong> {{ merchDetails.name }}</p>
-        <AttachLabel :merch-uuid="props.merch_uuid" />
       </div>
       <DetailsViewImages :merch-uuid="merchDetails.merch_uuid"/>
     </div>
@@ -109,10 +118,75 @@ onMounted(() => {
       <ChartBlock :charts-data="prices" />
     </div>
 
-    <div v-for="item in merchDetails.origins" :key="item">
-      <OriginBlock :merch_details="merchDetails" :merch_data="item" />
+    <!-- Surugaya -->
+    <CopyToClipboard :text="merchDetails.origin_surugaya?.link">
+      <n-divider title-placement="left">Surugaya</n-divider>
+    </CopyToClipboard>
+    <div v-if="!editing.surugaya">
+      <template v-if="merchDetails.origin_surugaya?.link">
+        <a
+          :href="merchDetails.origin_surugaya.link"
+          target="_blank"
+          rel="noopener"
+          class="default-color"
+        >
+          {{ merchDetails.origin_surugaya.link }}
+        </a>
+        <n-button type="primary" style="margin-left: 8px" @click="editing.surugaya = true">
+          Edit link
+        </n-button>
+      </template>
+      <template v-else>
+        <span class="default-color underline link-like-text" @click="editing.surugaya = true"
+          >Add link</span
+        >
+      </template>
     </div>
 
+    <EditLink
+      v-else
+      :merch-uuid="merch_uuid"
+      origin="surugaya"
+      :name="merchDetails.name"
+      :model-value="merchDetails.origin_surugaya?.link || ''"
+      @update:model-value="handleLinkUpdate('surugaya', $event)"
+      @cancel-edit="editing.surugaya = false"
+    />
+
+    <!-- Mandarake -->
+    <CopyToClipboard :text="merchDetails.origin_mandarake?.link">
+      <n-divider title-placement="left">Mandarake</n-divider>
+    </CopyToClipboard>
+    <div v-if="!editing.mandarake">
+      <template v-if="merchDetails.origin_mandarake?.link">
+        <a
+          :href="merchDetails.origin_mandarake.link"
+          target="_blank"
+          rel="noopener"
+          class="default-color"
+        >
+          {{ merchDetails.origin_mandarake.link }}
+        </a>
+        <n-button type="primary" style="margin-left: 8px" @click="editing.mandarake = true">
+          Edit link
+        </n-button>
+      </template>
+      <template v-else>
+        <span class="default-color underline link-like-text" @click="editing.mandarake = true"
+          >Add link</span
+        >
+      </template>
+    </div>
+
+    <EditLink
+      v-else
+      :merch-uuid="merch_uuid"
+      origin="mandarake"
+      :name="merchDetails.name"
+      :model-value="merchDetails.origin_mandarake?.link || ''"
+      @update:model-value="handleLinkUpdate('mandarake', $event)"
+      @cancel-edit="editing.mandarake = false"
+    />
   </n-card>
   <div v-else>Not found</div>
 
diff --git a/src/views/DetailsView/AttachLabel.vue b/src/views/DetailsView/AttachLabel.vue
deleted file mode 100644
index 18ca912..0000000
--- a/src/views/DetailsView/AttachLabel.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<script setup>
-import { computed, onMounted, ref } from 'vue'
-import { useLabelsStore } from '@/stores/labelsStore.js'
-import { useMessage } from 'naive-ui'
-import LabelTemplate from '@/components/LabelTemplate.vue'
-
-const store = useLabelsStore()
-const messages = useMessage()
-
-const props = defineProps({
-  merchUuid: {
-    type: String,
-    default: '',
-  },
-})
-
-const attachedLabels = ref([])
-const selectedLabelUuids = ref([])
-const loading = ref(false)
-
-const labelOptions = computed(() => {
-  const attachedUuids = new Set(attachedLabels.value.map(l => l.label_uuid))
-  return store.labels
-    .filter(label => !attachedUuids.has(label.label_uuid))
-    .map(label => ({
-      label: label.name,
-      value: label.label_uuid,
-    }))
-})
-
-const fetchAttachedLabels = async () => {
-  if (!props.merchUuid) return
-
-  loading.value = true
-  try {
-    const response = await store.getMerchLabels(props.merchUuid)
-    const uuids = response.data || []
-
-    if (!Array.isArray(uuids)) {
-      attachedLabels.value = []
-      return
-    }
-
-    const labelMap = new Map()
-    for (const label of store.labels) {
-      labelMap.set(label.label_uuid, label)
-    }
-
-    attachedLabels.value = uuids
-      .map(uuid => labelMap.get(uuid))
-      .filter(Boolean)
-  } catch (error) {
-    messages.error('Failed to load attached labels: ' + error)
-    attachedLabels.value = []
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleAttach = async () => {
-  if (!props.merchUuid) {
-    messages.error('Merch UUID is missing')
-    return
-  }
-  if (selectedLabelUuids.value.length === 0) {
-    messages.warning('No labels selected')
-    return
-  }
-
-  try {
-    await Promise.all(
-      selectedLabelUuids.value.map(labelUuid =>
-        store.attachLabel(props.merchUuid, labelUuid)
-      )
-    )
-    messages.success('Label(s) attached successfully')
-    selectedLabelUuids.value = []
-    await fetchAttachedLabels()
-  } catch (error) {
-    messages.error('Failed to attach label(s): ' + error)
-  }
-}
-
-const handleDetach = async (labelUuid) => {
-  if (!props.merchUuid) {
-    messages.error('Merch UUID is missing')
-    return
-  }
-
-  try {
-    await store.detachLabel(props.merchUuid, labelUuid)
-    messages.success('Label detached successfully')
-    await fetchAttachedLabels()
-  } catch (error) {
-    messages.error('Failed to detach label: ' + error)
-  }
-}
-
-onMounted(() => {
-  fetchAttachedLabels()
-})
-</script>
-
-<template>
-  <p><strong>Select labels to attach:</strong></p>
-  <div class="label-row">
-    <n-select
-      v-model:value="selectedLabelUuids"
-      multiple
-      :options="labelOptions"
-      :loading="loading"
-    />
-    <n-button
-      type="primary"
-      @click="handleAttach"
-      :disabled="selectedLabelUuids.length === 0 || loading"
-      style="width: 100px; margin-left: 12px"
-    >
-      Attach
-    </n-button>
-  </div>
-
-  <p><strong>Attached labels. Click label to detach it.</strong></p>
-  <div v-if="attachedLabels.length > 0" class="mt-10 label-row">
-    <LabelTemplate
-      v-for="label in attachedLabels"
-      :key="label.label_uuid"
-      :text="label.name"
-      :color="label.color"
-      :bg_color="label.bg_color"
-      @click="handleDetach(label.label_uuid)"
-      style="cursor: pointer"
-    />
-  </div>
-
-  <div class="mt-20">
-    <router-link :to="{ name: 'labels' }">
-      <n-button type="primary">
-        Manage labels
-      </n-button>
-    </router-link>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
diff --git a/src/views/DetailsView/DetailsViewImages.vue b/src/views/DetailsView/DetailsViewImages.vue
index dc7a258..7284760 100644
--- a/src/views/DetailsView/DetailsViewImages.vue
+++ b/src/views/DetailsView/DetailsViewImages.vue
@@ -54,21 +54,37 @@ function onFileInputChange(event) {
   event.target.value = ''
 }
 
-async function fetchImage(bustCache = false) {
+async function handleUpload({ fileList: newFileList }) {
+  const file = newFileList[newFileList.length - 1]
   try {
-    let imgUrl = getImageUrl(props.merchUuid, 'full')
+    await uploadImage(props.merchUuid, file.file)
 
-    if (bustCache) {
-      const separator = imgUrl.includes('?') ? '&' : '?'
-      imgUrl += `${separator}_t=${Date.now()}`
-    }
+    const { imgUrl } = await getImageUrl(props.merchUuid, 'full')
+
+    message.success('Image uploaded successfully.')
+
+    fileList.value = [
+      {
+        name: file.name,
+        url: imgUrl,
+        status: 'finished',
+      },
+    ]
+  } catch (error) {
+    message.error('Upload error: ' + (error.message || 'Unknown error.'))
+  }
+}
+
+onMounted(async () => {
+  try {
+    const imgUrl = getImageUrl(props.merchUuid, 'full');
 
     await new Promise((resolve, reject) => {
-      const img = new Image()
-      img.src = imgUrl
-      img.onload = () => resolve(imgUrl)
-      img.onerror = () => reject(new Error('Image not found'))
-    })
+      const img = new Image();
+      img.src = imgUrl;
+      img.onload = () => resolve(imgUrl);
+      img.onerror = () => reject(new Error('Image not found'));
+    });
 
     fileList.value = [
       {
@@ -76,28 +92,13 @@ async function fetchImage(bustCache = false) {
         url: imgUrl,
         status: 'finished',
       },
-    ]
+    ];
   } catch (error) {
-    fileList.value = []
+    fileList.value = [];
     if (!error.message.includes('404')) {
-      console.error('Error getting image:', error)
+      console.error('Error getting image: ', error);
     }
   }
-}
-
-async function handleUpload({ fileList: newFileList }) {
-  const file = newFileList[newFileList.length - 1]
-  try {
-    await uploadImage(props.merchUuid, file.file)
-    message.success('Image uploaded successfully.')
-    await fetchImage(true)
-  } catch (error) {
-    message.error('Upload error: ' + (error.message || 'Unknown error.'))
-  }
-}
-
-onMounted(async () => {
-  await fetchImage(false)
 });
 
 const showConfirmDelete = ref(false)
diff --git a/src/views/DetailsView/EditLink.vue b/src/views/DetailsView/EditLink.vue
index 027d87e..0053bf0 100644
--- a/src/views/DetailsView/EditLink.vue
+++ b/src/views/DetailsView/EditLink.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, nextTick } from 'vue'
 import { useMerchApi } from '@/api/merch.js'
-import { BASE_AMIAMI_LINK, BASE_MANDARAKE_LINK } from '@/main.js'
+import { BASE_MANDARAKE_LINK } from '@/main.js'
 
 const { updateMerch } = useMerchApi()
 
@@ -101,29 +101,18 @@ const cancel = () => {
   emit('cancel-edit')
 }
 
-const insertMandarakeLink = () => {
+const insertAutoCompletedLink = () => {
   tempValue.value = BASE_MANDARAKE_LINK+props.name
 }
 
-const insertAmiamiLink = () => {
-  tempValue.value = BASE_AMIAMI_LINK+props.name
-}
-
 </script>
 
 <template>
   <div v-if="props.origin === 'mandarake'" class="button-container-center mb-10">
-    <n-button type="warning" class="center-button" @click="insertMandarakeLink"
+    <n-button type="warning" class="center-button" @click="insertAutoCompletedLink"
       >Insert auto-completed link</n-button
     >
   </div>
-
-  <div v-if="props.origin === 'amiami'" class="button-container-center mb-10">
-    <n-button type="warning" class="center-button" @click="insertAmiamiLink"
-    >Insert auto-completed link</n-button
-    >
-  </div>
-
   <div class="editing-area">
     <n-input
       v-model:value="tempValue"
diff --git a/src/views/DetailsView/OriginBlock.vue b/src/views/DetailsView/OriginBlock.vue
deleted file mode 100644
index fabf2a6..0000000
--- a/src/views/DetailsView/OriginBlock.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue'
-import CopyToClipboard from '@/components/CopyToClipboard.vue'
-import EditLink from '@/views/DetailsView/EditLink.vue'
-
-const props = defineProps({
-  merch_data: {
-    type: Object,
-    required: true,
-  },
-  merch_details: {
-    type: Object,
-    required: true,
-  }
-})
-
-const editing = ref(false)
-
-const formattedName = computed(() => {
-  const name = props.merch_data?.name
-  if (!name) return ''
-  return name.charAt(0).toUpperCase() + name.slice(1)
-})
-
-function handleLinkUpdate(origin, newLink) {
-  props.merch_data.link = newLink
-  editing.value = false
-}
-
-</script>
-
-<template>
-  <CopyToClipboard :text="merch_data.link">
-    <n-divider title-placement="left">{{ formattedName }}</n-divider>
-  </CopyToClipboard>
-  <div v-if="!editing">
-    <template v-if="merch_data.link">
-      <a :href="merch_data.link" target="_blank" rel="noopener" class="default-color">
-        {{ merch_data.link }}
-      </a>
-      <n-button type="primary" style="margin-left: 8px" @click="editing = true">
-        Edit link
-      </n-button>
-    </template>
-    <template v-else>
-      <span class="default-color underline link-like-text" @click="editing = true"> Add link </span>
-    </template>
-  </div>
-
-  <EditLink
-    v-else
-    :merch-uuid="merch_details.merch_uuid"
-    :origin="merch_data.name"
-    :name="merch_details.name"
-    :model-value="merch_data.link"
-    @update:model-value="handleLinkUpdate(merch_data.name, $event)"
-    @cancel-edit="editing=false"
-  />
-
-</template>
-
-<style scoped></style>
diff --git a/src/views/LabelsView.vue b/src/views/LabelsView.vue
deleted file mode 100644
index 00637d7..0000000
--- a/src/views/LabelsView.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<script setup>
-import { useLabelsStore } from '@/stores/labelsStore.js'
-import LabelCard from '@/views/LabelsView/LabelCard.vue'
-import { NModal, useMessage } from 'naive-ui'
-import LabelForm from '@/views/LabelsView/LabelForm.vue'
-import { ref } from 'vue'
-import ScrollToTopButton from '@/components/ScrollToTopButton.vue'
-
-const store = useLabelsStore()
-const messages = useMessage()
-
-const editForm = ref({
-  name: '',
-  color: '#EF2D56FF',
-  bg_color: '#FFFFFF',
-})
-
-const handleCreate = async () => {
-  try {
-    const name = editForm.value.name?.trim() || 'preview'
-
-    await store.createLabel({
-      name,
-      color: editForm.value.color,
-      bg_color: editForm.value.bg_color,
-    })
-
-    editForm.value = {
-      name: '',
-      color: '#EF2D56FF',
-      bg_color: '#FFFFFF',
-    }
-
-    showCreateModal.value = false
-    messages.success('Label created.')
-  } catch (error) {
-    messages.error(error)
-    console.error('Failed to create label in component:', error)
-  }
-}
-
-const showCreateModal = ref(false)
-
-const cancelCreate = () => {
-  showCreateModal.value = false
-}
-</script>
-
-<template>
-  <h3>Manage labels</h3>
-  <n-divider title-placement="left">Create label</n-divider>
-  <n-modal v-model:show="showCreateModal" preset="dialog" title="Create new label">
-    <template #default>
-      <p>Enter new values to create label.</p>
-      <LabelForm :edit-form="editForm" />
-    </template>
-    <template #action>
-      <n-button @click="handleCreate" type="primary">Create</n-button>
-      <n-button @click="cancelCreate">Cancel</n-button>
-    </template>
-  </n-modal>
-  <div class="mt-10 c-center">
-    <n-button type="primary" @click="showCreateModal=true" :loading="false" class="w360">
-      Create Label
-    </n-button>
-  </div>
-
-  <n-divider title-placement="left">Current labels</n-divider>
-  <h4 class="text-center">Tip: click on a record to edit / delete label.</h4>
-
-  <div v-for="label in store.labels" :key="label.label_uuid">
-    <LabelCard :label-uuid="label.label_uuid" />
-  </div>
-
-  <ScrollToTopButton />
-</template>
-
-<style scoped></style>
diff --git a/src/views/LabelsView/LabelCard.vue b/src/views/LabelsView/LabelCard.vue
deleted file mode 100644
index 0b9d4e7..0000000
--- a/src/views/LabelsView/LabelCard.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<script setup>
-import { computed, ref, watch } from 'vue'
-import { NModal, useMessage } from 'naive-ui'
-import { useLabelsStore } from '@/stores/labelsStore.js'
-import LabelTemplate from '@/components/LabelTemplate.vue'
-import LabelDotTemplate from '@/components/LabelDotTemplate.vue'
-import LabelForm from '@/views/LabelsView/LabelForm.vue'
-
-const store = useLabelsStore()
-const message = useMessage()
-
-const props = defineProps({
-  labelUuid: {
-    type: String,
-    required: true,
-  },
-})
-
-const labelData = computed(() => {
-  return store.labels.find((label) => label.label_uuid === props.labelUuid)
-})
-
-const editForm = ref({})
-
-const showEditModal = ref(false)
-
-const editLabelRecordHandler = () => {
-  if (!labelData.value) return
-  editForm.value = { ...labelData.value }
-  showEditModal.value = true
-}
-
-const cancelEdit = () => {
-  showEditModal.value = false
-}
-
-const handleUpdate = async () => {
-  try {
-    await store.updateLabel(editForm.value.label_uuid, {
-      name: editForm.value.name,
-      color: editForm.value.color,
-      bg_color: editForm.value.bg_color,
-    })
-    showEditModal.value = false
-    message.success('Label updated successfully.')
-  } catch (error) {
-    message.error(error.message)
-  }
-}
-
-const confirmDelete = ref(false)
-
-const handleDelete = async () => {
-  if (!confirmDelete.value) return
-  try {
-    await store.deleteLabel(props.labelUuid)
-    showEditModal.value = false
-    message.success('Label deleted successfully.')
-  } catch (error) {
-    message.error(error.message)
-  }
-}
-
-//на случай изменений извне, хотя таких быть не должно
-watch(
-  () => props.labelData,
-  (newVal) => {
-    if (showEditModal.value) return
-    Object.assign(editForm.value, newVal)
-  },
-  { deep: true },
-)
-</script>
-
-<template>
-  <n-list hoverable clickable class="bottom-border">
-    <n-list-item @click="editLabelRecordHandler">
-      <div class="label-container">
-        <div>
-          <n-thing>Name: {{ labelData.name }}</n-thing>
-          <n-thing>UUID: {{ labelData.label_uuid }}</n-thing>
-        </div>
-
-        <div class="label-column">
-          <n-thing>
-            <div class="label-row">
-              <LabelDotTemplate :color="labelData.color" :bg_color="labelData.bg_color" />
-
-              <LabelTemplate
-                :text="labelData.name"
-                :color="labelData.color"
-                :bg_color="labelData.bg_color"
-              />
-            </div>
-          </n-thing>
-        </div>
-      </div>
-    </n-list-item>
-  </n-list>
-
-  <n-modal v-model:show="showEditModal" preset="dialog" title="Manage label record">
-    <template #default>
-      <p>Enter new values to update. Or hit delete button to delete record.</p>
-      <LabelForm :edit-form="editForm" />
-    </template>
-    <template #action>
-      <div class="modal-actions">
-        <div class="checkbox-row">
-          <n-checkbox v-model:checked="confirmDelete"> Check to confirm delete </n-checkbox>
-        </div>
-        <div class="buttons-row">
-          <n-button @click="handleUpdate" type="warning">Update</n-button>
-          <n-button @click="handleDelete" type="error" :disabled="!confirmDelete">Delete</n-button>
-          <n-button @click="cancelEdit">Cancel</n-button>
-        </div>
-      </div>
-    </template>
-  </n-modal>
-</template>
-
-<style scoped>
-.bottom-border {
-  border-bottom: rgba(24, 160, 88, 0.25) solid 1px;
-}
-
-.modal-actions {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  width: 100%;
-}
-
-.checkbox-row,
-.buttons-row {
-  display: flex;
-  align-items: center;
-}
-
-.buttons-row {
-  justify-content: flex-end;
-  gap: 8px;
-}
-</style>
diff --git a/src/views/LabelsView/LabelForm.vue b/src/views/LabelsView/LabelForm.vue
deleted file mode 100644
index c10e70c..0000000
--- a/src/views/LabelsView/LabelForm.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- LabelForm.vue -->
-<script setup>
-import LabelDotTemplate from '@/components/LabelDotTemplate.vue'
-import LabelTemplate from '@/components/LabelTemplate.vue'
-
-defineProps({
-  editForm: {
-    type: Object,
-    required: true
-  }
-})
-</script>
-
-<template>
-  <div class="label-row label-preview">
-    <span>Preview: </span>
-    <LabelDotTemplate :color="editForm.color" :bg_color="editForm.bg_color" />
-    <LabelTemplate
-      :text="editForm.name || 'preview'"
-      :color="editForm.color"
-      :bg_color="editForm.bg_color"
-    />
-  </div>
-
-  <n-form :model="editForm" label-placement="left" label-width="100">
-    <n-form-item label="Name" path="name">
-      <n-input v-model:value="editForm.name" />
-    </n-form-item>
-    <n-form-item label="Border and text color" path="color">
-      <n-color-picker v-model:value="editForm.color" />
-    </n-form-item>
-    <n-form-item label="Background color" path="bg_color">
-      <n-color-picker v-model:value="editForm.bg_color" />
-    </n-form-item>
-  </n-form>
-</template>
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 756bb8d..0a2015e 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -2,23 +2,16 @@
 import { reactive, ref } from 'vue'
 import { useAuthStore } from '@/stores/authStore.js'
 import { storeToRefs } from 'pinia'
-import { useMessage } from 'naive-ui'
 
 const store = useAuthStore()
-const messages = useMessage()
 
 const { activeTab } = storeToRefs(store)
 
 const signInEmail = ref('')
 const signInPassword = ref('')
 
-const onSignIn = async () => {
-  try{
-    await store.login(signInEmail.value, signInPassword.value)
-    messages.success('Login success')
-  } catch (error) {
-    messages.error("Login error")
-  }
+const onSignIn = () => {
+  store.login(signInEmail.value, signInPassword.value)
 }
 
 const signUp = reactive({
@@ -27,35 +20,8 @@ const signUp = reactive({
   reenterPassword: '',
 })
 
-const onSignUp = async () => {
-  if (!signUp.email.trim()) {
-    messages.error('Email is required')
-    return
-  }
-
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-  if (!emailRegex.test(signUp.email)) {
-    messages.error('Please enter a valid email address')
-    return
-  }
-
-  if (!signUp.password.trim()) {
-    messages.error('Password is required')
-    return
-  }
-
-  if (signUp.password !== signUp.reenterPassword) {
-    messages.error('Passwords do not match')
-    return
-  }
-
-  try{
-    await store.register(signUp.email, signUp.password)
-    messages.success('Register success')
-    activeTab.value = 'signin'
-  } catch (error) {
-    messages.error("Register error")
-  }
+const onSignUp = () => {
+  store.register(signUp.email, signUp.password)
 }
 </script>
 
@@ -77,7 +43,7 @@ const onSignUp = async () => {
           <n-form-item-row label="Password">
             <n-input v-model:value="signInPassword" type="password" show-password-on="click" />
           </n-form-item-row>
-          <n-button type="primary" block secondary strong attr-type="submit"> Sign In</n-button>
+          <n-button type="primary" block secondary strong attr-type="submit" @click="onSignIn"> Sign In</n-button>
         </n-form>
       </n-tab-pane>
 
@@ -92,7 +58,7 @@ const onSignUp = async () => {
           <n-form-item-row label="Reenter Password">
             <n-input type="password" v-model:value="signUp.reenterPassword" show-password-on="click" />
           </n-form-item-row>
-          <n-button type="primary" block secondary strong attr-type="submit">Sign up</n-button>
+          <n-button type="primary" block secondary strong attr-type="submit" @click="onSignUp">Sign up</n-button>
         </n-form>
       </n-tab-pane>
     </n-tabs>
diff --git a/src/views/PersonalView/PersonalMainBlock.vue b/src/views/PersonalView/PersonalMainBlock.vue
index cc45fca..0e89baf 100644
--- a/src/views/PersonalView/PersonalMainBlock.vue
+++ b/src/views/PersonalView/PersonalMainBlock.vue
@@ -14,26 +14,27 @@ onMounted(() => {
 </script>
 
 <template>
-  <n-divider title-placement="left">Main</n-divider>
+  <n-card :bordered="false" title="Main">
     <n-list hoverable clickable>
       <n-list-item>
-        <n-thing title="Email" class="mt-10">
+        <n-thing title="Email" content-style="margin-top: 10px;">
           {{ userData?.email || '---' }}
         </n-thing>
       </n-list-item>
 
       <n-list-item>
-        <n-thing title="Username" class="mt-10">
+        <n-thing title="Username" content-style="margin-top: 10px;">
           {{ userData?.username || '---' }}
         </n-thing>
       </n-list-item>
 
       <n-list-item>
-        <n-thing title="Created At" class="mt-10">
+        <n-thing title="Created At" content-style="margin-top: 10px;">
           {{ userData?.created_at || '---' }}
         </n-thing>
       </n-list-item>
     </n-list>
+  </n-card>
 </template>
 
 <style scoped></style>
diff --git a/src/views/PersonalView/PersonalSessionBlock.vue b/src/views/PersonalView/PersonalSessionBlock.vue
index a67743a..f8192d4 100644
--- a/src/views/PersonalView/PersonalSessionBlock.vue
+++ b/src/views/PersonalView/PersonalSessionBlock.vue
@@ -35,16 +35,16 @@ const onLogout = () => {
 </script>
 
 <template>
-  <n-divider title-placement="left">Session</n-divider>
+  <n-card :bordered="false" title="Session">
     <n-list hoverable clickable>
       <n-list-item>
-        <n-thing title="Session id" class="mt-10">
+        <n-thing title="Session id" content-style="margin-top: 10px;">
           {{ currentSession?.uuid || '---' }}
         </n-thing>
       </n-list-item>
 
       <n-list-item>
-        <n-thing title="Expires at" class="mt-10">
+        <n-thing title="Expires at" content-style="margin-top: 10px;">
           {{ formattedDate }}
         </n-thing>
       </n-list-item>
@@ -52,6 +52,7 @@ const onLogout = () => {
         <n-button type="info" class="center-button" @click="onLogout">Log out</n-button>
       </div>
     </n-list>
+  </n-card>
 </template>
 
 <style scoped>
diff --git a/src/views/ZeroPricesView.vue b/src/views/ZeroPricesView.vue
deleted file mode 100644
index 82d41a5..0000000
--- a/src/views/ZeroPricesView.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script setup>
-  import ScrollToTopButton from '@/components/ScrollToTopButton.vue'
-  import TargetZeroesTab from '@/views/ZeroPricesView/TargetZeroesTab.vue'
-  import PeriodSelectTab from '@/views/ZeroPricesView/PeriodSelectTab.vue'
-</script>
-
-<template>
-  <n-tabs type="line" animated>
-    <n-tab-pane name="Target zeroes" tab="Target zeroes">
-      <TargetZeroesTab />
-    </n-tab-pane>
-    <n-tab-pane name="Period select" tab="Period select">
-      <PeriodSelectTab />
-    </n-tab-pane>
-  </n-tabs>
-  <ScrollToTopButton />
-</template>
-
-<style scoped>
-</style>
diff --git a/src/views/ZeroPricesView/PeriodSelectTab.vue b/src/views/ZeroPricesView/PeriodSelectTab.vue
deleted file mode 100644
index 4239f15..0000000
--- a/src/views/ZeroPricesView/PeriodSelectTab.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<script setup>
-import { ref, onMounted, computed } from 'vue'
-import { useZeroPrices } from '@/api/zeroPrices.js'
-
-const range = ref(null)
-
-const setTodayRange = () => {
-  const now = new Date()
-  const start = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-  const end = new Date(start.getTime() + 24 * 60 * 60 * 1000)
-
-  range.value = [start.getTime(), end.getTime()]
-}
-
-onMounted(() => {
-  setTodayRange()
-})
-
-const toRFCtime = (timestamp) => {
-  return new Date(timestamp).toISOString()
-}
-
-const { deleteZeroPricesPeriod } = useZeroPrices()
-
-const deleteEnabled = computed(() => {
-  return range.value === null
-})
-
-const deletePeriod = async () => {
-  if (range.value !== null) {
-    const start = toRFCtime(range.value[0])
-    const end = toRFCtime(range.value[1])
-    await deleteZeroPricesPeriod(start, end)
-  } else {
-    console.log('Delete period select zero prices error')
-  }
-}
-
-
-</script>
-
-<template>
-  <n-date-picker
-    v-model:value="range"
-    type="datetimerange"
-    format="HH:mm:ss dd-MM-yyyy"
-    clearable
-  />
-  <div class="button-container-center">
-    <n-button class="center-button w360" type="error" :disabled="deleteEnabled" @click="deletePeriod">Delete</n-button>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/src/views/ZeroPricesView/TargetZeroesTab.vue b/src/views/ZeroPricesView/TargetZeroesTab.vue
deleted file mode 100644
index ba71ba5..0000000
--- a/src/views/ZeroPricesView/TargetZeroesTab.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import { useZeroPrices } from '@/api/zeroPrices.js'
-import ZeroPriceCard from '@/views/ZeroPricesView/ZeroPriceCard.vue'
-import ZeroPricesToolbar from '@/views/ZeroPricesView/ZeroPricesToolbar.vue'
-
-const { getZeroPrices } = useZeroPrices()
-
-const zeroPrices = ref([])
-const toDelete = ref([])
-
-const handleToggle = ({ id, merch_uuid, checked }) => {
-  if (checked) {
-    toDelete.value.push({ id, merch_uuid });
-  } else {
-    toDelete.value = toDelete.value.filter(item => item.id !== id);
-  }
-}
-
-const handleSelectAll = () => {
-  toDelete.value = zeroPrices.value.map(item => ({
-    id: item.id,
-    merch_uuid: item.merch_uuid
-  }))
-}
-
-const fetchZeroPrices = async () => {
-  try {
-    const response = await getZeroPrices()
-    zeroPrices.value = Array.isArray(response.data) ? response.data : []
-  } catch (error) {
-    console.error(error)
-  }
-}
-
-const handleDeleted = () => {
-  toDelete.value = []
-  fetchZeroPrices()
-}
-
-onMounted(() => {
-  fetchZeroPrices()
-})
-</script>
-
-<template>
-  <div v-if="zeroPrices.length === 0">
-    <n-h2 class="text-center">Zero prices</n-h2>
-    <n-h3 class="text-center">No data</n-h3>
-  </div>
-  <div v-else>
-    <div class="sticky-search-container">
-      <ZeroPricesToolbar
-        :selected="toDelete"
-        @deleted="handleDeleted"
-        @selectAll="handleSelectAll"
-      />
-    </div>
-    <div v-for="item in zeroPrices" :key="item.created_at">
-      <ZeroPriceCard
-        :zero-price="item"
-        @toggle="handleToggle"
-        :checked="toDelete.some(t => t.id === item.id)"
-      />
-    </div>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
diff --git a/src/views/ZeroPricesView/ZeroPriceCard.vue b/src/views/ZeroPricesView/ZeroPriceCard.vue
deleted file mode 100644
index 32bd31f..0000000
--- a/src/views/ZeroPricesView/ZeroPriceCard.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<script setup>
-import { computed } from 'vue'
-import { originColors } from '@/services/colors.js'
-
-const props = defineProps({
-  zeroPrice: {
-    type: Object,
-    required: true,
-  },
-  checked: {
-    type: Boolean,
-    default: false,
-  },
-})
-
-const emit = defineEmits(['toggle'])
-
-const handleCheckboxChange = (newValue) => {
-  emit('toggle', {
-    id: props.zeroPrice.id,
-    merch_uuid: props.zeroPrice.merch_uuid,
-    checked: newValue,
-  })
-}
-
-const currentOriginColor = computed(() => {
-  return originColors[props.zeroPrice.origin] || '#fff';
-});
-</script>
-
-<template>
-  <div class="zeroPriceCard mt-10">
-    <n-grid responsive="screen" item-responsive cols="4" :x-gap="16" :y-gap="16" class="shift">
-      <n-gi>
-        <n-checkbox :checked="checked" @update:checked="handleCheckboxChange">
-          <strong>Delete</strong>
-        </n-checkbox>
-      </n-gi>
-      <n-gi><strong>Name:</strong> {{ props.zeroPrice.name }}</n-gi>
-      <n-gi><strong>Created:</strong> {{ props.zeroPrice.created_at }}</n-gi>
-      <n-gi
-        ><strong>Origin:</strong>
-        <span class="bordered" :style="{ borderColor: currentOriginColor }">
-          {{ props.zeroPrice.origin }}
-        </span>
-      </n-gi>
-    </n-grid>
-  </div>
-</template>
-
-<style scoped>
-.zeroPriceCard {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 8px 16px;
-  background: #f5f5f5;
-  border-radius: 8px;
-  font-family: Arial, sans-serif;
-  font-size: 14px;
-  gap: 12px;
-  border: 1px solid #e0e0e0;
-}
-
-.bordered {
-  border: 1px solid;
-  border-radius: 4px;
-  padding: 2px;
-  margin: 3px;
-}
-</style>
diff --git a/src/views/ZeroPricesView/ZeroPricesToolbar.vue b/src/views/ZeroPricesView/ZeroPricesToolbar.vue
deleted file mode 100644
index abe01cb..0000000
--- a/src/views/ZeroPricesView/ZeroPricesToolbar.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<script setup>
-import { useMessage } from 'naive-ui'
-import { useZeroPrices } from '@/api/zeroPrices.js'
-const props = defineProps({
-  selected: {
-    type: Array,
-    required: true,
-  },
-})
-
-const messages = useMessage()
-const { deleteZeroPrices } = useZeroPrices()
-const emit = defineEmits(['deleted', 'selectAll'])
-
-const handleDelete = async () => {
-  try {
-    await deleteZeroPrices(props.selected)
-    messages.success("Selected zero prices deleted")
-    emit('deleted')
-  } catch (error) {
-    console.log(error)
-    messages.error("Error deleting selected prices")
-  }
-}
-
-const handleSelectAll = async () => {
-  emit('selectAll')
-}
-
-</script>
-
-<template>
-  <div class="toolbar button-container-evenly padding-lr-30">
-    <div v-if="props.selected.length === 0" class="toolbar-item">
-      <span>Select records to delete</span>
-    </div>
-    <div v-else class="toolbar-item">
-      {{ props.selected.length }} items selected
-    </div>
-    <div class="toolbar-item">
-      <span @click="handleSelectAll">Click here to select all</span>
-    </div>
-
-    <div class="toolbar-item">
-      <n-button
-        type="error"
-        :disabled="props.selected.length === 0"
-        @click="handleDelete"
-      >
-        Delete Selected
-      </n-button>
-    </div>
-  </div>
-</template>
-
-<style scoped></style>