diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3dd1f66f9..78e64002e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup Go
-        uses: WillAbides/setup-go-faster@v1.11.0
+        uses: WillAbides/setup-go-faster@v1.12.0
         with:
           go-version: 1.19
       - name: Static Check
diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index aaeb09ee7..bc86a482c 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -259,7 +259,7 @@
 
     <v-app-bar v-if="isLoggedIn" app color="background" elevation="0">
       <v-row style="width: 100%" justify="center" align="center">
-        <v-col cols="5">
+        <v-col cols="8">
           <app-search />
         </v-col>
         <v-col class="d-flex justify-start">
@@ -276,7 +276,6 @@
           </v-btn>
         </v-col>
         <v-col class="d-flex justify-end align-center">
-          <balance title="Balance: " loged-in-user />
           <languages v-if="false" />
           <v-menu offset-y transition="slide-y-transition">
             <template v-slot:activator="{ on, attrs }">
@@ -301,6 +300,9 @@
                   >
                 </v-list-item-content>
               </v-list-item>
+              <v-list-item>
+                <balance title="Balance: " loged-in-user />
+              </v-list-item>
               <v-divider></v-divider>
               <v-list-item @click="logoutHandler">
                 <v-list-item-title>Logout</v-list-item-title>
@@ -312,6 +314,23 @@
       <v-spacer></v-spacer>
     </v-app-bar>
 
+    <instances-table-modal
+      v-if="overlay.uuid"
+      :uuid="overlay.uuid"
+      :visible="overlay.isVisible"
+      @close="() => { overlay.isVisible = false }"
+    >
+      <template #activator>
+        <v-btn
+          color="success"
+          style="position: absolute; top: 90px; right: 25px; z-index: 100"
+          @click="overlay.isVisible = true"
+        >
+          {{ overlay.buttonTitle }}
+        </v-btn>
+      </template>
+    </instances-table-modal>
+
     <v-main>
       <router-view />
     </v-main>
@@ -321,21 +340,34 @@
 </template>
 
 <script>
+import api from "@/api.js";
 import config from "@/config.js";
 import balance from "@/components/balance.vue";
 import languages from "@/components/languages.vue";
 import appSearch from "@/components/search/search.vue";
 import AppSnackbar from "@/components/snackbar.vue";
+import instancesTableModal from "@/components/instances_table_modal.vue";
 
 export default {
   name: "App",
-  components: { AppSnackbar, balance, appSearch, languages },
+  components: {
+    AppSnackbar,
+    balance,
+    appSearch,
+    languages,
+    instancesTableModal
+  },
   data: () => ({
     isMenuMinimize: true,
     isMouseOnMenu: false,
     easterEgg: false,
     config,
     navTitles: config.navTitles ?? {},
+    overlay: {
+      isVisible: false,
+      buttonTitle: '',
+      uuid: ''
+    }
   }),
   methods: {
     logoutHandler() {
@@ -420,14 +452,26 @@ export default {
     },
   },
   created() {
-    // window.addEventListener("message", ({ data, origin }) => {
-    //   const url = `https://app.${location.host.split(".").slice(1).join(".")}`;
+    window.addEventListener("message", ({ data, origin }) => {
+      if (origin.includes("localhost") || !data) return;
+      if (data === "ready") return;
+      if (data.type === "get-user") {
+        const setting = "plugin-chats-overlay";
+
+        api.settings.get([setting]).then((res) => {
+          const { title } = JSON.parse(res[setting]);
 
-    //   if (origin !== url) return;
-    //   if (data === 'ready') return;
-    //   this.$store.commit("auth/setToken", data);
-    //   location.assign("/admin");
-    // });
+          this.overlay.buttonTitle = title;
+          this.overlay.uuid = data.value.uuid;
+        });
+        return;
+      }
+      if (data.type === "open-user") {
+        window.open(`/admin/accounts/${data.value.uuid}`, "_blank");
+        return;
+      }
+      console.log(data, origin);
+    });
 
     this.$store.dispatch("auth/load");
 
@@ -464,6 +508,8 @@ export default {
     });
 
     this.$router.afterEach((to) => {
+      this.overlay.uuid = "";
+      this.overlay.buttonTitle = "";
       this.setTitle(to.name);
     });
 
diff --git a/admin-ui/src/components/ServicesProvider/info.vue b/admin-ui/src/components/ServicesProvider/info.vue
index d018887ee..7461f1793 100644
--- a/admin-ui/src/components/ServicesProvider/info.vue
+++ b/admin-ui/src/components/ServicesProvider/info.vue
@@ -40,9 +40,12 @@
           >
             Edit
           </v-btn>
-          <v-btn class="mx-2" @click="downloadFile">
-            Download {{ isJson ? "JSON" : "YAML" }}
-          </v-btn>
+          <download-template-button
+            :name="downloadedFileName"
+            :template="template"
+            class="mx-2"
+            :type="isJson ? 'JSON' : 'YAML'"
+          />
           <v-switch
             class="mr-2"
             style="margin-top: 5px; padding-top: 0"
@@ -93,7 +96,7 @@
               color="background-light"
             >
               <nocloud-table
-                  table-name="sp-binded-plans"
+                table-name="sp-binded-plans"
                 :items="plans"
                 :headers="headers"
                 :loading="isPlanLoading"
@@ -155,11 +158,16 @@ import extentionsMap from "@/components/extentions/map.js";
 import nocloudTable from "@/components/table.vue";
 import ConfirmDialog from "@/components/confirmDialog.vue";
 import { format } from "date-fns";
-import { downloadJSONFile, downloadYAMLFile } from "@/functions.js";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "services-provider-info",
-  components: { JsonEditor, nocloudTable, ConfirmDialog },
+  components: {
+    DownloadTemplateButton,
+    JsonEditor,
+    nocloudTable,
+    ConfirmDialog,
+  },
   props: { template: { type: Object, required: true } },
   mixins: [snackbar],
   data: () => ({
@@ -321,16 +329,6 @@ export default {
           this.isDeleteLoading = false;
         });
     },
-    downloadFile() {
-      const name = this.template.title
-        ? this.template.title.replaceAll(" ", "_")
-        : "unknown_sp";
-      if (this.isJson) {
-        downloadJSONFile(this.template, name);
-      } else {
-        downloadYAMLFile(this.template, name);
-      }
-    },
   },
   mounted() {
     this.provider = this.template;
@@ -385,6 +383,11 @@ export default {
             import("@/components/modules/custom/serviceProviderInfo.vue");
       }
     },
+    downloadedFileName() {
+      return this.template.title
+        ? this.template.title.replaceAll(" ", "_")
+        : "unknown_sp";
+    },
   },
 };
 </script>
diff --git a/admin-ui/src/components/account/info.vue b/admin-ui/src/components/account/info.vue
index 04f99a03a..11aac9850 100644
--- a/admin-ui/src/components/account/info.vue
+++ b/admin-ui/src/components/account/info.vue
@@ -1,17 +1,30 @@
 <template>
   <v-card elevation="0" color="background-light" class="pa-4">
+    <div style="position: absolute; top: 0; right: 75px">
+      <div>
+        <v-chip color="primary" outlined
+          >Balance: {{ account.balance?.toFixed(2) }}
+          {{ account.currency }}</v-chip
+        >
+      </div>
+    </div>
+
     <v-row>
-      <v-col cols="6">
-        <v-text-field
-          v-model="uuid"
-          readonly
-          label="UUID"
-          style="width: 330px"
-        />
+      <v-col cols="3">
+        <v-text-field v-model="uuid" readonly label="UUID" />
       </v-col>
-      <v-col cols="6">
+      <v-col cols="3">
         <v-text-field v-model="title" label="name" style="width: 330px" />
       </v-col>
+      <v-col cols="3">
+        <v-select
+          :readonly="isCurrencyReadonly"
+          :items="currencies"
+          v-model="currency"
+          label="currency"
+          style="width: 330px"
+        />
+      </v-col>
     </v-row>
     <v-card-title class="px-0">Instances:</v-card-title>
 
@@ -105,6 +118,7 @@ export default {
     navTitles: config.navTitles ?? {},
     uuid: "",
     title: "",
+    currency: "",
     keys: [],
     selected: [],
     isVisible: false,
@@ -131,7 +145,14 @@ export default {
       this.selected = [];
     },
     editAccount() {
-      const newAccount = { ...this.account, title: this.title };
+      const newAccount = {
+        ...this.account,
+        title: this.title,
+        currency: this.currency,
+      };
+      if (!newAccount.data) {
+        newAccount.data = {};
+      }
       newAccount.data.ssh_keys = this.keys;
 
       this.isEditLoading = true;
@@ -156,6 +177,7 @@ export default {
   },
   mounted() {
     this.title = this.account.title;
+    this.currency = this.account.currency;
     this.uuid = this.account.uuid;
     this.keys = this.account.data?.ssh_keys || [];
     if (this.namespaces.length < 2) {
@@ -175,6 +197,9 @@ export default {
     services() {
       return this.$store.getters["services/all"];
     },
+    currencies() {
+      return this.$store.getters["currencies/all"].filter((c) => c !== "NCU");
+    },
     servicesProviders() {
       return this.$store.getters["servicesProviders/all"];
     },
@@ -189,6 +214,9 @@ export default {
         (i) => i.access.namespace === accountNamespace.uuid
       );
     },
+    isCurrencyReadonly() {
+      return this.account.currency && this.account.currency !== "NCU";
+    },
   },
 };
 </script>
diff --git a/admin-ui/src/components/account/reports.vue b/admin-ui/src/components/account/reports.vue
index 4f8330e78..364b01a10 100644
--- a/admin-ui/src/components/account/reports.vue
+++ b/admin-ui/src/components/account/reports.vue
@@ -2,18 +2,23 @@
   <reports_table
     table-name="reports"
     hide-account
+    :duration="duration"
+    @input:duration="duration = $event"
     :filters="filters"
     hide-service
+    show-dates
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["account"]);
 const { account } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     account: [account.value.uuid],
diff --git a/admin-ui/src/components/accounts_table.vue b/admin-ui/src/components/accounts_table.vue
index 33df6b7f6..90ae2d6ec 100644
--- a/admin-ui/src/components/accounts_table.vue
+++ b/admin-ui/src/components/accounts_table.vue
@@ -2,7 +2,7 @@
   <nocloud-table
     table-name="accounts"
     :headers="headers"
-    :items="filtredAccounts"
+    :items="filteredAccounts"
     :value="selected"
     :loading="loading"
     :single-select="singleSelect"
@@ -44,6 +44,17 @@
         :value="item.balance"
       />
     </template>
+    <template v-slot:[`item.address`]="{ item }">
+      <v-tooltip> </v-tooltip>
+      <v-tooltip bottom>
+        <template v-slot:activator="{ on, attrs }">
+          <span v-bind="attrs" v-on="on">
+            {{ item.data?.city || item.data?.address }}
+          </span>
+        </template>
+        <span>{{ item.data?.address }}</span>
+      </v-tooltip>
+    </template>
     <template v-slot:[`item.access.level`]="{ value }">
       <v-chip :color="colorChip(value)">
         {{ value }}
@@ -63,7 +74,7 @@ import noCloudTable from "@/components/table.vue";
 import Balance from "./balance.vue";
 import LoginInAccountIcon from "@/components/ui/loginInAccountIcon.vue";
 import { mapGetters } from "vuex";
-import { filterByKeysAndParam } from "@/functions";
+import { filterByKeysAndParam, formatSecondsToDate } from "@/functions";
 
 export default {
   name: "accounts-table",
@@ -95,6 +106,9 @@ export default {
         { text: "UUID", value: "uuid" },
         { text: "Balance", value: "balance" },
         { text: "Email", value: "data.email" },
+        { text: "Created date", value: "data.date_create" },
+        { text: "Country", value: "data.country" },
+        { text: "Address", value: "address" },
         { text: "Client currency", value: "currency" },
         { text: "Access level", value: "access.level" },
         { text: "Group(NameSpace)", value: "namespace" },
@@ -130,17 +144,23 @@ export default {
       searchParam: "customSearchParam",
       searchParams: "customParams",
     }),
-    tableData() {
-      return this.$store.getters["accounts/all"];
+    accounts() {
+      return this.$store.getters["accounts/all"].map((a) => ({
+        ...a,
+        data: {
+          ...a.data,
+          date_create: formatSecondsToDate(a.data?.date_create),
+        },
+      }));
     },
-    filtredAccounts() {
+    filteredAccounts() {
       const searchParams = { ...this.searchParams };
 
       if (this.namespace) {
         searchParams["access.namespace"] = [{ value: this.namespace }];
       }
 
-      const accounts = this.tableData.filter((a) =>
+      const accounts = this.accounts.filter((a) =>
         Object.keys(searchParams).every((k) => {
           return (
             !searchParams?.[k] ||
@@ -210,7 +230,7 @@ export default {
     }, 0);
   },
   watch: {
-    tableData() {
+    accounts() {
       this.fetchError = "";
     },
   },
diff --git a/admin-ui/src/components/dialogs/changeMonitorings.vue b/admin-ui/src/components/dialogs/changeMonitorings.vue
index 6ae19e4cc..7256f7a34 100644
--- a/admin-ui/src/components/dialogs/changeMonitorings.vue
+++ b/admin-ui/src/components/dialogs/changeMonitorings.vue
@@ -8,12 +8,12 @@
     <v-card class="pa-5">
       <v-card-title class="text-center">Change next payment dates</v-card-title>
       <div v-if="!isChangeAll">
-        <v-row v-for="key in Object.keys(lastMonitorings || {})" :key="key">
+        <v-row v-for="key in Object.keys(nextPaymentDates || {})" :key="key">
           <v-col cols="4">
-            <v-card-title>{{ lastMonitorings[key].title }}</v-card-title>
+            <v-card-title>{{ nextPaymentDates[key].title }}</v-card-title>
           </v-col>
           <v-col cols="8">
-            <date-picker :min="min" v-model="lastMonitorings[key].value" />
+            <date-picker :min="min" v-model="nextPaymentDates[key].value" />
           </v-col>
         </v-row>
       </div>
@@ -56,33 +56,22 @@ const store = useStore();
 const { template, service } = toRefs(props);
 const changeDatesLoading = ref(false);
 const isChangeAll = ref(true);
-const lastMonitorings = ref({});
+const nextPaymentDates = ref({});
 const newAllDate = ref();
 const min = ref();
 
-const setLastMonitorings = () => {
+const setNextPaymentDate = () => {
   const data = JSON.parse(JSON.stringify(template.value.data));
 
   const monitorings = {};
 
   Object.keys(data).forEach((key) => {
-    if (key.includes("last_monitoring") && data[key]) {
+    if (key.includes("next_payment_date") && data[key]) {
       const title = key
-        .replace("_last_monitoring", "")
-        .replace("last_monitoring", "product");
+        .replace("_next_payment_date", "")
+        .replace("next_payment_date", "product");
       let value = +data[key];
 
-      if (title === "product") {
-        value =
-          value +
-          +template.value.billingPlan.products[template.value.product].period;
-      } else {
-        value =
-          value +
-          +template.value.billingPlan.resources.find((r) => r.key === title)
-            ?.period;
-      }
-
       value = formatSecondsToDate(value);
       monitorings[key] = {
         value: value,
@@ -92,12 +81,14 @@ const setLastMonitorings = () => {
     }
   });
 
-  lastMonitorings.value = monitorings;
+  nextPaymentDates.value = monitorings;
 
-  newAllDate.value = monitorings["last_monitoring"].value;
+  newAllDate.value = monitorings["next_payment_date"].value;
 };
 
 const changeDates = async () => {
+  changeDatesLoading.value = true;
+
   const tempService = JSON.parse(JSON.stringify(service.value));
 
   const igIndex = tempService.instancesGroups.findIndex((ig) =>
@@ -109,28 +100,21 @@ const changeDates = async () => {
 
   const changedDates = {};
 
-  Object.keys(lastMonitorings.value).forEach((key) => {
+  Object.keys(nextPaymentDates.value).forEach((key) => {
     if (
       isChangeAll.value ||
-      lastMonitorings.value[key].firstValue != lastMonitorings.value[key].value
+      nextPaymentDates.value[key].firstValue !=
+        nextPaymentDates.value[key].value
     ) {
-      const { value, title } = lastMonitorings.value[key];
+      const { value } = nextPaymentDates.value[key];
 
-      let baseVal =
+      let newVal =
         new Date(isChangeAll.value ? newAllDate.value : value).getTime() / 1000;
+      let oldVal = new Date(template.value.data[key]).getTime();
 
-      if (title === "product") {
-        baseVal =
-          baseVal -
-          +template.value.billingPlan.products[template.value.product].period;
-      } else {
-        baseVal =
-          baseVal -
-          +template.value.billingPlan.resources.find((r) => r.key === title)
-            ?.period;
-      }
-
-      changedDates[key] = baseVal;
+      changedDates[key.replace("next_payment_date", "last_monitoring")] =
+        oldVal + (newVal - oldVal);
+      changedDates[key] = newVal;
     }
   });
 
@@ -139,7 +123,6 @@ const changeDates = async () => {
     ...changedDates,
   };
 
-  changeDatesLoading.value = true;
   try {
     await api.services._update(tempService);
     emit("refresh");
@@ -154,7 +137,7 @@ const changeDates = async () => {
 };
 
 onMounted(() => {
-  setLastMonitorings();
+  setNextPaymentDate();
   //tommoraw
   min.value = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
     .toISOString()
diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index a35e323ee..5d103d92e 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -72,8 +72,7 @@
 import { toRefs, ref, computed, onMounted, watch } from "vue";
 import api from "@/api";
 import { getBillingPeriod } from "@/functions";
-import useRate from "@/hooks/useRate";
-import { useStore } from "@/store";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps([
   "template",
@@ -85,13 +84,11 @@ const props = defineProps([
 ]);
 const emit = defineEmits(["refresh", "input"]);
 
-const { convertFrom } = useRate();
+const { convertTo, defaultCurrency } = useCurrency();
 
 const { template, plans, service, accountRate, accountCurrency } =
   toRefs(props);
 
-const store = useStore();
-
 const isChangePMLoading = ref(false);
 const plan = ref({});
 const product = ref({});
@@ -209,13 +206,11 @@ const isChangeBtnDisabled = computed(() => {
 const fullProduct = computed(() => plan.value?.products?.[product.value]);
 
 const accountPrice = computed(() =>
-  accountRate.value && fullProduct.value?.price
-    ? convertFrom(fullProduct.value.price, accountRate.value)
+  accountCurrency.value && fullProduct.value?.price
+    ? convertTo(fullProduct.value.price, accountCurrency.value)
     : 0
 );
 
-const defaultCurrency = computed(() => store.getters["currencies/default"]);
-
 const changePM = () => {
   const tempService = JSON.parse(JSON.stringify(service.value));
 
diff --git a/admin-ui/src/components/instance/controls.vue b/admin-ui/src/components/instance/controls.vue
index 393889af0..78b8285dc 100644
--- a/admin-ui/src/components/instance/controls.vue
+++ b/admin-ui/src/components/instance/controls.vue
@@ -16,6 +16,11 @@
     >
       {{ btn.title || btn.action }}
     </v-btn>
+    <confirm-dialog @confirm="lockInstance">
+      <v-btn :loading="isLockLoading" class="mr-2">
+        {{ template.data.lock ? "User unlock" : "User lock" }}
+      </v-btn>
+    </confirm-dialog>
     <confirm-dialog @confirm="deleteInstance">
       <v-btn class="mr-2" :loading="isLoading"> Delete </v-btn>
     </confirm-dialog>
@@ -60,7 +65,11 @@ export default {
     copyTemplate: { type: Object },
     sp: { type: Object },
   },
-  data: () => ({ isLoading: false, isSaveLoading: false }),
+  data: () => ({
+    isLoading: false,
+    isSaveLoading: false,
+    isLockLoading: false,
+  }),
   methods: {
     ...mapActions("actions", ["sendVmAction"]),
     async deleteInstance() {
@@ -97,6 +106,40 @@ export default {
         this.isLoading = false;
       }
     },
+    lockInstance() {
+      const lock = !this.template.data.lock;
+
+      const tempService = JSON.parse(JSON.stringify(this.service));
+      const igIndex = tempService.instancesGroups.findIndex((ig) =>
+        ig.instances.find((i) => i.uuid === this.template.uuid)
+      );
+      const instanceIndex = tempService.instancesGroups[
+        igIndex
+      ].instances.findIndex((i) => i.uuid === this.template.uuid);
+
+      tempService.instancesGroups[igIndex].instances[instanceIndex] = {
+        ...this.template,
+        data: { ...this.template.data, lock },
+      };
+
+      this.isLockLoading = true;
+      api.services
+        ._update(tempService)
+        .then(() => {
+          this.showSnackbarSuccess({
+            message: `Instance ${lock ? "lock" : "unlock"} successfully`,
+          });
+
+          this.$store.dispatch("services/fetch", this.template.uuid);
+          this.$store.dispatch("servicesProviders/fetch");
+        })
+        .catch((err) => {
+          this.showSnackbarError({ message: err });
+        })
+        .finally(() => {
+          this.isSaveLoading = false;
+        });
+    },
     async save() {
       const tempService = JSON.parse(JSON.stringify(this.service));
       const instance = JSON.parse(JSON.stringify(this.copyTemplate));
diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index 1d3d0e8f2..f7a771395 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -46,13 +46,6 @@
           :value="account?.balance?.toFixed(2) || 0"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="client currency"
-          :value="account?.currency"
-        />
-      </v-col>
     </v-row>
     <!--    <component-->
     <!--      v-if="!type.includes('ovh') && !type.includes('ione')"-->
@@ -137,9 +130,13 @@
 
     <div
       v-if="billingLabelComponent"
-      style="position: absolute; top: 0; right: 75px"
+      style="position: absolute; top: 0px; right: 5px; z-index: 2"
     >
-      <component :is="billingLabelComponent" :template="copyInstance" />
+      <component
+        @update="updateCopy"
+        :is="billingLabelComponent"
+        :template="copyInstance"
+      />
     </div>
   </v-card>
 </template>
diff --git a/admin-ui/src/components/instance/reports.vue b/admin-ui/src/components/instance/reports.vue
index 35c9149b8..845349d77 100644
--- a/admin-ui/src/components/instance/reports.vue
+++ b/admin-ui/src/components/instance/reports.vue
@@ -5,16 +5,21 @@
     hide-instance
     hide-service
     :filters="filters"
+    show-dates
+    :duration="duration"
+    @input:duration="duration = $event"
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["template"]);
 const { template } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     instance: [template.value.uuid],
diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
index c8774311e..c0c026528 100644
--- a/admin-ui/src/components/instances_table.vue
+++ b/admin-ui/src/components/instances_table.vue
@@ -4,7 +4,7 @@
     class="mt-4"
     :value="value"
     :items="instances"
-    :headers="headers"
+    :headers="instancesHeaders"
     :loading="isLoading"
     :custom-sort="sortInstances"
     :footer-error="fetchError"
@@ -62,7 +62,11 @@
     </template>
 
     <template v-slot:[`item.price`]="{ item }">
-      {{ getValue("price", item) }} {{ currency }}
+      {{ getValue("price", item) }}
+    </template>
+
+    <template v-slot:[`item.accountPrice`]="{ item }">
+      {{ getValue("accountPrice", item) }}
     </template>
 
     <template v-slot:[`item.period`]="{ item }">
@@ -150,6 +154,7 @@ export default {
   mixins: [searchMixin],
   props: {
     value: { type: Array, required: true },
+    headers: { type: Array, default: null },
     selected: { type: Object, default: null },
     showSelect: { type: Boolean, default: true },
     items: { type: Array, default: () => [] },
@@ -276,6 +281,26 @@ export default {
         }
       }
     },
+    getNcuPrice(inst) {
+      return this.getPrice(inst) + " " + this.defaultCurrency;
+    },
+    getAccountPrice(inst) {
+      const accountCurrency = this.getAccount(inst)?.currency;
+
+      return (
+        (this.getPrice(inst) * this.getRate(accountCurrency)).toFixed(2) +
+        " " +
+        accountCurrency
+      );
+    },
+    getRate(currency) {
+      if (this.defaultCurrency === currency) {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.to === currency && r.from === this.defaultCurrency
+      )?.rate;
+    },
     getPeriod(inst) {
       if (inst.type === "ione" && inst.billingPlan.kind === "DYNAMIC") {
         return "PayG";
@@ -327,8 +352,8 @@ export default {
       return inst.data.creation ?? "unknown";
     },
     getExpirationDate(inst) {
-      if (inst.type === "ovh") return inst.data.expiration;
-      if (inst.type === "ione") return this.date(inst.data.last_monitoring);
+      if (inst.data.next_payment_date)
+        return this.date(inst.data.next_payment_date);
       return "unknown";
     },
     getService({ service }) {
@@ -388,6 +413,7 @@ export default {
         "billingPlan.title",
         "account.data.email",
         "price",
+        "accountPrice",
         "state.meta.networking.public",
       ];
       const instances = this.items.filter((i) => {
@@ -460,7 +486,8 @@ export default {
     accounts() {
       return this.$store.getters["accounts/all"];
     },
-    headers() {
+    instancesHeaders() {
+      if (this.headers) return this.headers;
       const headers = [
         { text: "ID", value: "id" },
         { text: "Title", value: "title" },
@@ -475,7 +502,8 @@ export default {
         { text: "Tariff", value: "product" },
         { text: "Service provider", value: "sp" },
         { text: "Type", value: "type" },
-        { text: "Price", value: "price" },
+        { text: "NCU price", value: "price" },
+        { text: "Account price", value: "accountPrice" },
         { text: "Period", value: "period" },
         { text: "Email", value: "email" },
         { text: "Date", value: "date" },
@@ -499,7 +527,8 @@ export default {
         email: this.getEmail,
         state: getState,
         product: (item) => item.product ?? this.getTariff(item) ?? "custom",
-        price: this.getPrice,
+        price: this.getNcuPrice,
+        accountPrice: this.getAccountPrice,
         period: this.getPeriod,
         date: this.getCreationDate,
         dueDate: this.getExpirationDate,
@@ -515,9 +544,6 @@ export default {
     isLoading() {
       return this.$store.getters["services/isLoading"];
     },
-    currency() {
-      return this.$store.getters["currencies/default"];
-    },
     priceModelItems() {
       return [
         ...new Set(
@@ -603,6 +629,12 @@ export default {
         },
       };
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    defaultCurrency() {
+      return this.$store.getters["currencies/default"];
+    },
   },
   watch: {
     instances() {
diff --git a/admin-ui/src/components/instances_table_modal.vue b/admin-ui/src/components/instances_table_modal.vue
new file mode 100644
index 000000000..a372ff32c
--- /dev/null
+++ b/admin-ui/src/components/instances_table_modal.vue
@@ -0,0 +1,57 @@
+<template>
+  <v-dialog max-width="1280" :value="visible" @input="$emit('close')">
+    <template v-slot:activator="{ on, attrs }">
+      <slot v-on="on" v-bind="attrs" name="activator" />
+    </template>
+    <v-card elevation="0" color="background" class="pa-4">
+      <instances-table
+        class="mt-0"
+        :value="null"
+        :headers="headers"
+        :items="accountInstances"
+        :show-select="false"
+      />
+    </v-card>
+  </v-dialog>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import store from '@/store'
+import instancesTable from '@/components/instances_table.vue'
+
+const props = defineProps({
+  uuid: { type: String, required: true },
+  visible: { type: Boolean, required: true }
+})
+
+const headers = [
+  { text: "Title", value: "title" },
+  { text: "Due date", value: "dueDate" },
+  { text: "Status", value: "state" },
+  { text: "Tariff", value: "product" },
+  { text: "Price", value: "accountPrice" },
+]
+
+const namespaces = computed(() =>
+  store.getters['namespaces/all'] ?? []
+)
+
+const instances = computed(() =>
+  store.getters['services/getInstances'] ?? []
+)
+
+const accountInstances = computed(() => {
+  const namespace = namespaces.value.find(({ access }) => 
+    access.namespace === props.uuid
+  )
+
+  if (!namespace) return []
+  return instances.value.filter(({ access }) =>
+    access.namespace === namespace.uuid
+  )
+})
+
+store.dispatch('services/fetch')
+store.dispatch('namespaces/fetch')
+</script>
diff --git a/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue b/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
index a78b9237e..a37e1e8eb 100644
--- a/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
+++ b/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
@@ -4,7 +4,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="State"
+          label="OpenNebula State"
           :value="template.state.meta?.state_str || template.state.state"
         />
       </v-col>
diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 5179cf814..6771648eb 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -13,28 +13,15 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
-          :value="template.product"
+          label="Product name"
+          :value="
+            template.billingPlan.products[template.product]?.title ||
+            template.product
+          "
           append-icon="mdi-pencil"
           @click:append="changeTariffDialog = true"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          :suffix="defaultCurrency"
-          readonly
-          label="Price instance total"
-          :value="price"
-        />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -57,75 +44,68 @@
           @click:append="changeDatesDialog = true"
         />
       </v-col>
-      ></v-row
-    >
-    <v-expansion-panels>
-      <v-expansion-panel>
-        <v-expansion-panel-header color="background-light"
-          >Prices</v-expansion-panel-header
-        >
-        <v-expansion-panel-content
-          class="ione-billing"
-          color="background-light"
-        >
-          <nocloud-table
-            class="mb-5"
-            :headers="billingHeaders"
-            :items="billingItems"
-            no-hide-uuid
-            :show-select="false"
-            hide-default-footer
-          >
-            <template v-slot:[`item.price`]="{ item }">
-              <div class="d-flex">
-                <v-text-field
-                  class="mr-1"
-                  :suffix="accountCurrency"
-                  v-model="item.accountPrice"
-                  @input="updatePrice(item, true)"
-                  append-icon="mdi-pencil"
-                />
-                <v-text-field
-                  class="ml-1"
-                  :suffix="defaultCurrency"
-                  v-model="item.price"
-                  @input="updatePrice(item, false)"
-                  append-icon="mdi-pencil"
-                />
-              </div>
-            </template>
-            <template v-slot:[`item.quantity`]="{ item }">
-              {{ item.quantity?.toFixed(2) }}
-            </template>
-            <template v-slot:[`item.total`]="{ item }">
-              {{ totalAccountPrices[item.name]?.toFixed(2) }}
-              {{ accountCurrency }} / {{ totalPrices[item.name]?.toFixed(2) }}
-              {{ defaultCurrency }}
-            </template>
-            <template v-slot:body.append>
-              <tr>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td>
-                  {{
-                    billingItems.find((i) => i.name === template.product)
-                      ?.period
-                  }}
-                </td>
-                <td>
-                  {{ totalAccountPrice }} {{ accountCurrency }} /
-                  {{ totalPrice }}
-                  {{ defaultCurrency }}
-                </td>
-              </tr>
-            </template>
-          </nocloud-table>
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+    </v-row>
+    <instances-prices-panels>
+      <nocloud-table
+        class="mb-5"
+        :headers="billingHeaders"
+        :items="billingItems"
+        no-hide-uuid
+        :show-select="false"
+        hide-default-footer
+      >
+        <template v-slot:[`item.price`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              :suffix="defaultCurrency"
+              v-model="item.price"
+              type="number"
+              @input="updatePrice(item, false)"
+              append-icon="mdi-pencil"
+            />
+            <v-text-field
+              style="color: #c921c9"
+              class="ml-2"
+              type="number"
+              :suffix="accountCurrency"
+              v-model="item.accountPrice"
+              @input="updatePrice(item, true)"
+              append-icon="mdi-pencil"
+            />
+          </div>
+        </template>
+        <template v-slot:[`item.quantity`]="{ item }">
+          {{ item.quantity?.toFixed(2) }} {{ item.unit }}
+        </template>
+        <template v-slot:[`item.total`]="{ item }">
+          {{ totalPrices[item.name]?.toFixed(2) }}
+          {{ defaultCurrency }} /
+          {{ totalAccountPrices[item.name]?.toFixed(2) }}
+          {{ accountCurrency }}
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                billingItems.find((i) => i.name === template.product)?.period
+              }}
+            </td>
+            <td></td>
+            <td></td>
+            <td>
+              <v-chip color="primary" outlined>
+                {{ totalAccountPrice }} {{ accountCurrency }} /
+                {{ totalPrice }}
+                {{ defaultCurrency }}
+              </v-chip>
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
     <change-ione-monitorings
       :template="template"
       :service="service"
@@ -172,8 +152,9 @@ import ChangeIoneMonitorings from "@/components/dialogs/changeMonitorings.vue";
 import ChangeIoneTarrif from "@/components/dialogs/changeIoneTarrif.vue";
 import NocloudTable from "@/components/table.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import { useStore } from "@/store";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans", "service", "sp"]);
 const emit = defineEmits(["refresh", "update"]);
@@ -181,41 +162,28 @@ const emit = defineEmits(["refresh", "update"]);
 const { template, service, sp, plans } = toRefs(props);
 
 const store = useStore();
-const {
-  fetchAccountRate,
-  accountCurrency,
-  toAccountPrice,
-  accountRate,
-  fromAccountPrice,
-} = useAccountConverter(template.value);
+const { accountCurrency, toAccountPrice, accountRate, fromAccountPrice } =
+  useInstancePrices(template.value);
 
 const changeDatesDialog = ref(false);
 const changeTariffDialog = ref(false);
 const priceModelDialog = ref(false);
-const price = ref(0);
-const accountPrice = ref(0);
 const billingItems = ref([]);
 const billingHeaders = ref([
   { text: "Name", value: "name" },
-  { text: "Unit name", value: "unit" },
-  { text: "Price per unit", value: "price" },
-  { text: "Unit quantity", value: "quantity" },
   { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
+  { text: "Price per unit", value: "price" },
+  { text: "Unit quantity", value: "quantity" },
   { text: "Total price", value: "total" },
 ]);
 
 onMounted(() => {
   billingItems.value = getBillingItems();
-  price.value = totalPrice.value;
-  fetchAccountRate(accountCurrency);
 });
 
 const date = computed(() =>
-  formatSecondsToDate(
-    +template.value?.data?.last_monitoring +
-      +template.value.billingPlan.products[template.value.product].period
-  )
+  formatSecondsToDate(+template.value?.data?.next_payment_date)
 );
 const defaultCurrency = computed(() => store.getters["currencies/default"]);
 const isMonitoringEmpty = computed(() => date.value === "-");
@@ -262,9 +230,11 @@ const totalAccountPrice = computed(() => toAccountPrice(totalPrice.value));
 const getBillingItems = () => {
   const items = [];
 
+  const price = billingPlan.value.products[template.value.product]?.price;
   items.push({
     name: template.value.product,
-    price: billingPlan.value.products[template.value.product]?.price,
+    price,
+    accountPrice: toAccountPrice(price),
     path: `billingPlan.products.${template.value.product}.price`,
     quantity: 1,
     unit: "pcs",
@@ -286,6 +256,7 @@ const getBillingItems = () => {
       items.push({
         name: resourceKey,
         price: addon.price,
+        accountPrice: toAccountPrice(addon.price),
         kind: addon.kind,
         period: addon.period,
         quantity,
@@ -305,6 +276,7 @@ const getBillingItems = () => {
     items.push({
       name: driveType,
       price: drive?.price,
+      accountPrice: toAccountPrice(drive.price),
       path: `billingPlan.resources.${driveIndex}.price`,
       kind: drive?.kind,
       quantity: template.value.resources.drive_size / 1024,
@@ -347,7 +319,6 @@ watch(accountRate, () => {
     i.accountPrice = toAccountPrice(i.price);
     return i;
   });
-  accountPrice.value = totalAccountPrice.value;
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/ione/billingLabel.vue b/admin-ui/src/components/modules/ione/billingLabel.vue
index c4a42ba27..77bd514a0 100644
--- a/admin-ui/src/components/modules/ione/billingLabel.vue
+++ b/admin-ui/src/components/modules/ione/billingLabel.vue
@@ -5,6 +5,7 @@
     :addons-price="addonsPrice"
     :tariff-price="tariffPrice"
     :due-date="dueDate"
+    @update="emit('update', $event)"
   />
 </template>
 
@@ -15,6 +16,7 @@ import { useStore } from "@/store";
 import billingLabel from "@/components/ui/billingLabel.vue";
 
 const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
 
 const store = useStore();
 
@@ -64,10 +66,7 @@ const addonsPrice = ref(
 );
 
 const dueDate = computed(() => {
-  return formatSecondsToDate(
-    +template.value?.data?.last_monitoring +
-      +template.value.billingPlan.products[template.value.product].period
-  );
+  return formatSecondsToDate(+template.value?.data?.next_payment_date);
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/ione/planConfiguration.vue b/admin-ui/src/components/modules/ione/planConfiguration.vue
index f02128e5a..ecf7345a8 100644
--- a/admin-ui/src/components/modules/ione/planConfiguration.vue
+++ b/admin-ui/src/components/modules/ione/planConfiguration.vue
@@ -5,6 +5,7 @@
         <v-text-field
           label="Minimum disk size"
           type="number"
+          suffix="GB"
           v-model="meta.minDisk"
         />
       </v-col>
@@ -12,6 +13,7 @@
         <v-text-field
           label="Maximum disk size"
           type="number"
+          suffix="GB"
           v-model="meta.maxDisk"
         />
       </v-col>
@@ -54,7 +56,7 @@ export default {
     },
   },
   mounted() {
-    this.meta=this.template.meta
+    this.meta = this.template.meta;
   },
   watch: {
     "template.meta"(newVal) {
@@ -64,4 +66,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>
diff --git a/admin-ui/src/components/modules/openai/billingInfo.vue b/admin-ui/src/components/modules/openai/billingInfo.vue
index b8f29235f..783665662 100644
--- a/admin-ui/src/components/modules/openai/billingInfo.vue
+++ b/admin-ui/src/components/modules/openai/billingInfo.vue
@@ -90,7 +90,7 @@ import {
   watch,
 } from "vue";
 import NocloudTable from "@/components/table.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import { useStore } from "@/store";
 import api from "@/api";
 
@@ -101,12 +101,11 @@ const { template, plans, service } = toRefs(props);
 
 const store = useStore();
 const {
-  fetchAccountRate,
   accountCurrency,
   toAccountPrice,
   accountRate,
   fromAccountPrice,
-} = useAccountConverter(template.value);
+} = useInstancePrices(template.value);
 
 const priceModelDialog = ref(false);
 const newPlan = ref();
@@ -121,7 +120,6 @@ const billingHeaders = ref([
 
 onMounted(() => {
   billingItems.value = getBillingItems();
-  fetchAccountRate(accountCurrency);
 });
 const filteredPlans = computed(() =>
   plans.value.filter((p) => p.type === "openai")
diff --git a/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue b/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
index e41be9376..f9b3c61a6 100644
--- a/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
+++ b/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
@@ -24,11 +24,11 @@
           @click:append="isVisible = !isVisible"
         />
       </v-col>
+    </v-row>
+    <v-row>
       <v-col>
         <v-text-field readonly :value="cpu" label="CPU" />
       </v-col>
-    </v-row>
-    <v-row>
       <v-col>
         <v-text-field readonly :value="template.resources.ram" label="RAM" />
       </v-col>
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index d78d972eb..accb6357b 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -13,28 +13,12 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
+          label="Product name"
           :value="tarrif.title"
           append-icon="mdi-pencil"
           @click:append="priceModelDialog = true"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          :suffix="defaultCurrency"
-          label="Price instance total"
-          :value="type === 'dedicated' ? +totalNewPrice?.toFixed(2) : getPrice"
-        />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountTotalNewPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -46,80 +30,68 @@
         <v-text-field readonly label="Due to date/next payment" :value="date" />
       </v-col>
     </v-row>
-    <v-expansion-panels>
-      <v-expansion-panel>
-        <v-expansion-panel-header color="background-light"
-          >Prices</v-expansion-panel-header
-        >
-        <v-expansion-panel-content
-          class="ione-billing"
-          color="background-light"
-        >
-          <nocloud-table
-            hide-default-footer
-            sort-by="index"
-            item-key="key"
-            :show-select="false"
-            :headers="pricesHeaders"
-            :items="pricesItems"
-          >
-            <template v-slot:[`item.prices`]="{ item }">
-              <div class="d-flex">
-                <v-text-field
-                  class="mr-1"
-                  v-model="item.accountPrice"
-                  @change="onUpdatePrice(item, true)"
-                  :suffix="accountCurrency"
-                  type="number"
-                  append-icon="mdi-pencil"
-                ></v-text-field>
-                <v-text-field
-                  class="ml-1"
-                  v-model="item.price"
-                  @change="onUpdatePrice(item, false)"
-                  :suffix="defaultCurrency"
-                  type="number"
-                  append-icon="mdi-pencil"
-                ></v-text-field>
+
+    <instances-prices-panels>
+      <nocloud-table
+        hide-default-footer
+        sort-by="index"
+        item-key="key"
+        :show-select="false"
+        :headers="pricesHeaders"
+        :items="pricesItems"
+      >
+        <template v-slot:[`item.prices`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              v-model="item.price"
+              @change="onUpdatePrice(item, false)"
+              :suffix="defaultCurrency"
+              type="number"
+              append-icon="mdi-pencil"
+            ></v-text-field>
+            <v-text-field
+              class="ml-2"
+              style="color: #c921c9"
+              v-model="item.accountPrice"
+              @change="onUpdatePrice(item, true)"
+              :suffix="accountCurrency"
+              type="number"
+              append-icon="mdi-pencil"
+            ></v-text-field>
+          </div>
+        </template>
+        <template v-slot:[`item.basePrice`]="{ item }">
+          <v-skeleton-loader type="text" v-if="isBasePricesLoading" />
+          <span v-else> {{ convertedBasePrices[item.key] }} PLN </span>
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td></td>
+            <td>
+              {{ getBillingPeriod(tarrif.period) }}
+            </td>
+            <td>
+              {{
+                isBasePricesLoading
+                  ? "Loading..."
+                  : [totalBasePrice, "PLN"].join(" ")
+              }}
+            </td>
+            <td>
+              <div class="d-flex justify-end">
+                <v-chip outlined color="primary" class="mr-4">
+                  {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
+                  /
+                  {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
+                </v-chip>
               </div>
-            </template>
-            <template v-slot:[`item.basePrice`]="{ item }">
-              <v-text-field
-                :loading="isBasePricesLoading"
-                readonly
-                suffix="PLN"
-                :value="convertedBasePrices[item.key]"
-              ></v-text-field>
-            </template>
-            <template v-slot:body.append>
-              <tr>
-                <td>Total instance price</td>
-                <td></td>
-                <td>
-                  {{
-                    isBasePricesLoading
-                      ? "Loading..."
-                      : [totalBasePrice, "PLN"].join(" ")
-                  }}
-                </td>
-                <td>
-                  <div class="d-flex align-center">
-                    <span style="width: 50%">
-                      {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
-                    </span>
-                    <span style="width: 50%">
-                      {{
-                        [totalNewPrice?.toFixed(2), defaultCurrency].join(" ")
-                      }}
-                    </span>
-                  </div>
-                </td>
-              </tr>
-            </template>
-          </nocloud-table>
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
 
     <edit-price-model
       @refresh="emit('refresh')"
@@ -148,7 +120,8 @@ import { useStore } from "@/store";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import usePlnRate from "@/hooks/usePlnRate";
 import { formatSecondsToDate, getBillingPeriod } from "@/functions";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans"]);
 const emit = defineEmits(["refresh", "update"]);
@@ -157,18 +130,14 @@ const { template, plans } = toRefs(props);
 
 const store = useStore();
 const rate = usePlnRate();
-const {
-  toAccountPrice,
-  fromAccountPrice,
-  fetchAccountRate,
-  accountCurrency,
-  accountRate,
-} = useAccountConverter(template.value);
+const { toAccountPrice, fromAccountPrice, accountCurrency, accountRate } =
+  useInstancePrices(template.value);
 
 const pricesItems = ref([]);
 const basePrices = ref({});
 const pricesHeaders = ref([
   { text: "Name", value: "title" },
+  { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
   { text: "Base price", value: "basePrice" },
   { text: "Price", value: "prices" },
@@ -240,7 +209,7 @@ const getVpsPrices = async () => {
   const prices = {};
 
   const planCodeCurr = meta.plans.find((p) => planCode.value === p.planCode);
-  prices["tarrif"] = getPriceFromProduct(planCodeCurr);
+  prices[planCode.value] = getPriceFromProduct(planCodeCurr);
   addons.value.forEach((addon) => {
     Object.keys(meta).forEach((metaKey) => {
       const product =
@@ -262,7 +231,7 @@ const getDedicatedPrice = async () => {
   const prices = {};
 
   const planCodeCurr = meta.plans.find((p) => planCode.value === p.planCode);
-  prices["tarrif"] = getPriceFromProduct(planCodeCurr);
+  prices[planCode.value] = getPriceFromProduct(planCodeCurr);
   const addonsPrice = await api.servicesProviders.action({
     action: "get_baremetal_options",
     uuid: template.value.sp,
@@ -304,7 +273,7 @@ const getCloudPrices = async () => {
       projectId: fullSp.vars?.projectId?.value?.default,
     },
   });
-  prices["tarrif"] = meta.codes[tarrif.value?.meta?.priceCode];
+  prices[planCode.value] = meta.codes[tarrif.value?.meta?.priceCode];
   return prices;
 };
 const getPriceFromProduct = (product) => {
@@ -328,23 +297,18 @@ const getAddonKey = (key) => {
 };
 
 const date = computed(() => {
-  if (type.value === "cloud") {
-    return formatSecondsToDate(
-      +template.value?.data?.last_monitoring + +tarrif.value.period
-    );
-  }
-
-  return template.value.data.expiration;
+  return formatSecondsToDate(+template.value?.data?.next_payment_date);
 });
 
 const initPrices = () => {
   pricesItems.value.push({
-    title: "tarrif",
-    key: "tarrif",
+    title: planCode.value,
+    key: planCode.value,
     ind: 0,
     path: `billingPlan.products.${[duration.value, planCode.value].join(
       " "
     )}.price`,
+    kind: tarrif.value.kind,
     price: tarrif.value?.price,
     period: tarrif.value?.period,
   });
@@ -354,19 +318,26 @@ const initPrices = () => {
       (p) => p.key === getAddonKey(key)
     );
 
+    const addon = template.value.billingPlan.resources[addonIndex];
+
+    if (!addon) {
+      return;
+    }
+
     pricesItems.value.push({
-      price: template.value.billingPlan.resources[addonIndex]?.price || 0,
+      price: addon.price || 0,
       path: `billingPlan.resources.${addonIndex}.price`,
       title: key,
+      kind: addon.kind,
       key: key,
       index: ind + 1,
-      period: template.value.billingPlan.resources[addonIndex]?.period,
+      period: addon.period,
     });
   });
 
   pricesItems.value = pricesItems.value.map((i) => {
     i.period = getBillingPeriod(i.period);
-    i.accountPrice = i.price * accountRate.value;
+    i.accountPrice = toAccountPrice(i.price);
 
     return i;
   });
@@ -386,20 +357,6 @@ const tarrif = computed(() => {
   }
   return template.value.billingPlan.products[key];
 });
-const getPrice = computed(() => {
-  const prices = [];
-  prices.push(tarrif.value?.price);
-  addons.value.forEach((name) => {
-    prices.push(
-      template.value.billingPlan.resources.find(
-        (p) =>
-          p.key === [duration.value, planCode, name].join(" ") ||
-          p.key === [duration.value, name].join(" ")
-      )?.price || 0
-    );
-  });
-  return prices.reduce((acc, val) => acc + val, 0);
-});
 
 const service = computed(() =>
   store.getters["services/all"].find((s) => s.uuid === template.value.service)
@@ -431,14 +388,6 @@ const getBasePrices = async () => {
 onMounted(() => {
   initPrices();
   getBasePrices();
-  if (accountCurrency.value) {
-    fetchAccountRate(accountCurrency.value).then(() => {
-      pricesItems.value = pricesItems.value.map((i) => {
-        i.accountPrice = toAccountPrice(i.price);
-        return i;
-      });
-    });
-  }
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/ovh/billingLabel.vue b/admin-ui/src/components/modules/ovh/billingLabel.vue
index c702d8a9b..da8f9b37a 100644
--- a/admin-ui/src/components/modules/ovh/billingLabel.vue
+++ b/admin-ui/src/components/modules/ovh/billingLabel.vue
@@ -5,6 +5,7 @@
     :template="template"
     :addons-price="addonsPrice"
     :account="account"
+    @update="emit('update', $event)"
   />
 </template>
 
@@ -15,6 +16,7 @@ import billingLabel from "@/components/ui/billingLabel.vue";
 import { useStore } from "@/store";
 
 const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
 
 const { template } = toRefs(props);
 
@@ -31,16 +33,7 @@ const account = computed(() => {
 });
 
 const dueDate = computed(() => {
-  const { duration, planCode } = props.template.config;
-  const key = `${duration} ${planCode}`;
-  if (props.template.config.type === "cloud") {
-    return formatSecondsToDate(
-      +props.template?.data?.last_monitoring +
-        +props.template.billingPlan.products[key].period
-    );
-  }
-
-  return props.template.data.expiration;
+  return formatSecondsToDate(+props.template?.data?.next_payment_date);
 });
 
 const tariffPrice = computed(() => {
diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index fda46bfa4..7a927c4f3 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -164,8 +164,8 @@ const getDefaultInstance = () => ({
       vps_datacenter: null,
       vps_os: null,
     },
-    duration: "P1M",
-    pricingMode: "default",
+    duration: "",
+    pricingMode: "",
     addons: [],
   },
   data: { existing: false },
@@ -193,7 +193,6 @@ export default {
     regions: {},
     images: {},
     addons: {},
-    durationItems: ["P1H", "P1M", "P1Y"],
 
     ovhTypes: [
       { title: "ovh vps", value: "vps" },
@@ -247,6 +246,7 @@ export default {
       this.addons[planCode] = newAddons;
     },
     setValue(path, val) {
+      console.log(path, val);
       const data = JSON.parse(JSON.stringify(this.instance));
 
       if (path.includes("billing_plan")) {
@@ -321,7 +321,10 @@ export default {
       }
 
       if (path.includes("duration")) {
-        data.config.pricingMode = val === "P1M" ? "default" : "upfront12";
+        this.$emit("set-value", {
+          value: val === "P1Y" ? "upfront12" : "default",
+          key: "config.pricingMode",
+        });
       }
 
       if (path.includes("addons")) {
@@ -371,13 +374,10 @@ export default {
       return this.instance.config.addons.find((a) => addon.includes(a));
     },
     setProduct() {
-      const data = JSON.parse(JSON.stringify(this.instance));
-      if (data.billing_plan?.kind?.toLowerCase() === "static") {
-        this.$emit("set-value", {
-          value: `${data.config?.duration} ${data.config?.planCode}`,
-          key: "product",
-        });
-      }
+      this.$emit("set-value", {
+        value: this.product,
+        key: "product",
+      });
     },
     setInstanceGroup(key, value) {
       this.$emit("set-instance-group", { ...this.instanceGroup, [key]: value });
@@ -397,6 +397,20 @@ export default {
 
       return tariffs;
     },
+    product() {
+      return [
+        this.instance.config.duration,
+        this.instance.config.planCode,
+      ].join(" ");
+    },
+    durationItems() {
+      const items = new Set();
+      this.flavors[this.instance.billing_plan?.uuid]?.forEach((item) => {
+        items.add(item.duration);
+      });
+
+      return [...items.values()];
+    },
   },
   async created() {
     if (!this.isEdit) {
@@ -415,9 +429,7 @@ export default {
         this.instance.config.configuration.vps_os
       );
       this.setAddons(
-        this.instance.billing_plan.products[
-          `${this.instance.config.duration} ${this.instance.config.planCode}`
-        ]?.meta?.addons,
+        this.instance.billing_plan.products[this.product]?.meta?.addons,
         this.instance.config.planCode
       );
     }
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index d876d5931..fe56c1890 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -13,23 +13,12 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
+          label="Product name"
           :value="billingPlan.products[template.product].title"
           @click:append="priceModelDialog = true"
           append-icon="mdi-pencil"
         />
       </v-col>
-      <v-col>
-        <v-text-field readonly label="Price instance total" :value="price" />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -53,40 +42,58 @@
         />
       </v-col>
     </v-row>
-    <nocloud-table
-      class="mb-5"
-      :headers="billingHeaders"
-      :items="billingItems"
-      no-hide-uuid
-      :show-select="false"
-      hide-default-footer
-    >
-      <template v-slot:[`item.price`]="{ item }">
-        <v-text-field
-          v-model="item.price"
-          @input="updatePrice(item, false)"
-          append-icon="mdi-pencil"
-        />
-      </template>
-      <template v-slot:[`item.accountPrice`]="{ item }">
-        <v-text-field
-          v-model="item.accountPrice"
-          @input="updatePrice(item, true)"
-          append-icon="mdi-pencil"
-        />
-      </template>
-      <template v-slot:body.append>
-        <tr>
-          <td>Total:</td>
-          <td />
-          <td>
-            {{ billingItems.find((i) => i.name === template.product)?.period }}
-          </td>
-          <td>{{ [totalAccountPrice, accountCurrency].join(" ") }}</td>
-          <td>{{ totalPrice }}</td>
-        </tr>
-      </template>
-    </nocloud-table>
+
+    <instances-prices-panels>
+      <nocloud-table
+        class="mb-5"
+        :headers="billingHeaders"
+        :items="billingItems"
+        no-hide-uuid
+        :show-select="false"
+        hide-default-footer
+      >
+        <template v-slot:[`item.price`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              v-model="item.price"
+              :suffix="defaultCurrency"
+              @input="updatePrice(item, false)"
+              append-icon="mdi-pencil"
+            />
+            <v-text-field
+              class="ml-2"
+              :suffix="accountCurrency"
+              style="color: #c921c9"
+              v-model="item.accountPrice"
+              @input="updatePrice(item, true)"
+              append-icon="mdi-pencil"
+            />
+          </div>
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td />
+            <td>
+              {{
+                billingItems.find((i) => i.name === template.product)?.period
+              }}
+            </td>
+            <td>
+              <div class="d-flex justify-end mr-4">
+                <v-chip color="primary" outlined>
+                  {{ [totalPrice, defaultCurrency].join(" ") }}
+                  /
+                  {{ [totalAccountPrice, accountCurrency].join(" ") }}
+                </v-chip>
+              </div>
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
+
     <change-monitorings
       :template="template"
       :service="service"
@@ -110,63 +117,56 @@ import { computed, defineProps, toRefs, ref, watch, onMounted } from "vue";
 import { formatSecondsToDate, getBillingPeriod } from "@/functions";
 import ChangeMonitorings from "@/components/dialogs/changeMonitorings.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import NocloudTable from "@/components/table.vue";
+import { useStore } from "@/store";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans", "service", "sp"]);
 const emit = defineEmits(["refresh"]);
 
 const { template, plans, service } = toRefs(props);
 
-const {
-  fetchAccountRate,
-  accountCurrency,
-  toAccountPrice,
-  accountRate,
-  fromAccountPrice,
-} = useAccountConverter(template.value);
+const store = useStore();
+const { accountCurrency, toAccountPrice, accountRate, fromAccountPrice } =
+  useInstancePrices(template.value);
 
 const changeDatesDialog = ref(false);
 const priceModelDialog = ref(false);
-const accountPrice = ref(0);
 const billingHeaders = ref([
   { text: "Name", value: "name" },
   { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
-  { text: "Account price", value: "accountPrice" },
   { text: "Price", value: "price" },
 ]);
 const billingItems = ref([]);
 
 const date = computed(() =>
-  formatSecondsToDate(template.value?.data?.last_monitoring)
+  formatSecondsToDate(template.value?.data?.next_payment_date)
 );
 const isMonitoringsEmpty = computed(() => date.value === "-");
 
-const price = computed(() => {
-  return template.value.billingPlan.products[template.value.product]?.price;
-});
-
 const filtredPlans = computed(() =>
   plans.value.filter((p) => p.type === "virtual")
 );
 
-const totalAccountPrice = computed(() => {
-  return toAccountPrice(totalPrice.value);
-});
 const totalPrice = computed(() => {
   return billingItems.value.reduce((acc, i) => acc + +i.price, 0);
 });
 
+const totalAccountPrice = computed(() => {
+  return billingItems.value.reduce((acc, i) => acc + +i.accountPrice, 0);
+});
+
 const billingPlan = computed(() => template.value.billingPlan);
 
+const defaultCurrency = computed(() => store.getters["currencies/default"]);
+
 onMounted(() => {
-  fetchAccountRate();
   billingItems.value = getBillingItems();
 });
 
 watch(accountRate, () => {
-  accountPrice.value = totalAccountPrice.value;
   billingItems.value = billingItems.value.map((i) => {
     i.accountPrice = toAccountPrice(i.price);
     return i;
@@ -175,13 +175,14 @@ watch(accountRate, () => {
 
 const getBillingItems = () => {
   const items = [];
-
+  const price = billingPlan.value.products[template.value.product]?.price;
   items.push({
     name: template.value.product,
-    price: billingPlan.value.products[template.value.product]?.price,
+    price,
     path: `billingPlan.products.${template.value.product}.price`,
     kind: billingPlan.value.products[template.value.product]?.kind,
     period: billingPlan.value.products[template.value.product]?.period,
+    accountPrice: toAccountPrice(price),
   });
 
   return items.map((i) => {
diff --git a/admin-ui/src/components/modules/virtual/billingLabel.vue b/admin-ui/src/components/modules/virtual/billingLabel.vue
new file mode 100644
index 000000000..0e0496ea9
--- /dev/null
+++ b/admin-ui/src/components/modules/virtual/billingLabel.vue
@@ -0,0 +1,46 @@
+<template>
+  <billing-label
+    :due-date="dueDate"
+    :tariff-price="tariffPrice"
+    :template="template"
+    :addons-price="{}"
+    :account="account"
+    @update="emit('update', $event)"
+  />
+</template>
+
+<script setup>
+import { computed, toRefs } from "vue";
+import { formatSecondsToDate } from "@/functions";
+import billingLabel from "@/components/ui/billingLabel.vue";
+import { useStore } from "@/store";
+
+const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
+
+const { template } = toRefs(props);
+
+const store = useStore();
+
+const account = computed(() => {
+  const namespace = store.getters["namespaces/all"]?.find(
+    (n) => n.uuid === template.value.access.namespace
+  );
+  const account = store.getters["accounts/all"].find(
+    (a) => a.uuid === namespace.access.namespace
+  );
+  return account;
+});
+
+const dueDate = computed(() => {
+  return formatSecondsToDate(+props.template?.data?.next_payment_date);
+});
+
+const tariffPrice = computed(() => {
+  const key = props.template.product;
+
+  return props.template.billingPlan.products[key]?.price ?? 0;
+});
+</script>
+
+<style scoped></style>
diff --git a/admin-ui/src/components/plan/cloudTable.vue b/admin-ui/src/components/plan/cloudTable.vue
index 69bc83c56..d9cd711a4 100644
--- a/admin-ui/src/components/plan/cloudTable.vue
+++ b/admin-ui/src/components/plan/cloudTable.vue
@@ -43,11 +43,15 @@
           </template>
           <template v-slot:[`item.endPrice`]="{ item }">
             <v-text-field
-              style="min-width: 50px"
+              style="width: 200px"
+              :suffix="defaultCurrency"
               v-model.number="item.endPrice"
               type="number"
             />
           </template>
+          <template v-slot:[`item.price`]="{ value }">
+            {{ value }} {{ defaultCurrency }}
+          </template>
           <template v-slot:[`item.gpu.model`]="{ item }">
             <template v-if="item.gpu.model !== ''">
               {{ item.gpu.model }} (x{{ item.gpu.number }})
@@ -113,8 +117,8 @@ import {
 import api from "@/api";
 import { useStore } from "@/store";
 import NocloudTable from "@/components/table.vue";
-import usePlnRate from "@/hooks/usePlnRate";
 import { getMarginedValue } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   fee: { type: Object, required: true },
@@ -127,7 +131,7 @@ const props = defineProps({
 const { sp, template, fee } = toRefs(props);
 
 const store = useStore();
-const rate = usePlnRate();
+const { convertFrom, defaultCurrency } = useCurrency();
 
 const expanded = ref([]);
 const tab = ref("prices");
@@ -235,9 +239,10 @@ const fetchFlavours = async () => {
         const { gpu = { model: "", number: 0 } } = meta.technical[value] ?? {};
         const period = key === "monthly" ? "P1M" : "P1H";
         const planCode = `${period} ${flavour.id}`;
-        const price = parseFloat(
-          prices.value[selectedRegion.value]?.[flavour.planCodes[key]] * rate.value
-        ).toFixed(2);
+        const price = convertFrom(
+          prices.value[selectedRegion.value]?.[flavour.planCodes[key]],
+          "PLN"
+        );
 
         newFlavours.push({
           ...flavour,
@@ -345,7 +350,7 @@ const changePlan = (plan) => {
           ram: item.ram,
           cpu: item.vcpus,
           gpu_name: item.gpu.model,
-          gpu_count: item.gpu.number
+          gpu_count: item.gpu.number,
         },
         meta: {
           priceCode: item.priceCode,
diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 76f9479b5..769cf1a75 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -31,26 +31,30 @@
       :footer-error="fetchError"
     >
       <template v-slot:[`item.name`]="{ item }">
-        <v-text-field dense style="width: 300px" v-model="item.name" />
+        <v-text-field dense style="width: 200px" v-model="item.name" />
       </template>
 
       <template v-slot:[`item.group`]="{ item }">
-        <template v-if="newGroup.mode === 'edit' && newGroup.planId === item.id">
+        <template
+          v-if="newGroup.mode === 'edit' && newGroup.planId === item.id"
+        >
           <v-text-field
             dense
             class="d-inline-block mr-1"
-            style="width: 300px"
+            style="width: 200px"
             v-model="newGroup.name"
           />
           <v-icon @click="editGroup(item.group)">mdi-content-save</v-icon>
           <v-icon @click="newGroup.mode = 'none'">mdi-close</v-icon>
         </template>
 
-        <template v-if="newGroup.mode === 'create' && newGroup.planId === item.id">
+        <template
+          v-if="newGroup.mode === 'create' && newGroup.planId === item.id"
+        >
           <v-text-field
             dense
             class="d-inline-block mr-1"
-            style="width: 300px"
+            style="width: 200px"
             v-model="newGroup.name"
           />
           <v-icon @click="createGroup(item)">mdi-content-save</v-icon>
@@ -61,17 +65,20 @@
           <v-select
             dense
             class="d-inline-block"
-            style="width: 300px"
+            style="width: 200px"
             v-model="item.group"
             :items="groups"
-            @change="item.name = getName(item)"
           />
           <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
           <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
-          <v-icon v-if="groups.length > 1" @click="deleteGroup(item.group)">mdi-delete</v-icon>
+          <v-icon v-if="groups.length > 1" @click="deleteGroup(item.group)"
+            >mdi-delete</v-icon
+          >
         </template>
 
-        <template v-else-if="newGroup.planId !== item.id">{{ item.group }}</template>
+        <template v-else-if="newGroup.planId !== item.id">{{
+          item.group
+        }}</template>
       </template>
 
       <template v-slot:[`item.margin`]="{ item }">
@@ -87,7 +94,12 @@
       </template>
 
       <template v-slot:[`item.value`]="{ item }">
-        <v-text-field dense style="width: 150px" v-model="item.value" />
+        <v-text-field
+          dense
+          style="min-width: 200px"
+          v-model="item.value"
+          :suffix="defaultCurrency"
+        />
       </template>
 
       <template v-slot:expanded-item="{ headers, item }">
@@ -138,7 +150,12 @@
               {{ value }} {{ defaultCurrency }}
             </template>
             <template v-slot:[`item.value`]="{ item }">
-              <v-text-field dense style="width: 150px" v-model="item.value" />
+              <v-text-field
+                dense
+                style="width: 200px"
+                :suffix="defaultCurrency"
+                v-model="item.value"
+              />
             </template>
             <template v-slot:[`item.sell`]="{ item }">
               <v-switch v-model="item.sell" />
@@ -156,7 +173,6 @@
 <script>
 import api from "@/api.js";
 import nocloudTable from "@/components/table.vue";
-import currencyRate from "@/mixins/currencyRate";
 import { getMarginedValue } from "@/functions";
 
 export default {
@@ -222,9 +238,8 @@ export default {
 
     groups: [],
     newGroup: { mode: "none", name: "", planId: "" },
-    usedFee: {}
+    usedFee: {},
   }),
-  mixins: [currencyRate],
   methods: {
     getAddons({ planCode, duration }) {
       return this.addons[planCode]?.filter((a) => a.duration === duration);
@@ -283,54 +298,62 @@ export default {
     async changePlan(plan) {
       if (!this.plans.every(({ group }) => this.groups.includes(group))) {
         this.$store.commit("snackbar/showSnackbarError", {
-          message: "You must select a group for the tariff!"
+          message: "You must select a group for the tariff!",
         });
         return "error";
       }
 
+      plan.products = {};
+
       const sp = this.$store.getters["servicesProviders/all"];
       const { uuid } = sp.find((el) => el.type === "ovh");
 
       plan.resources = this.template.resources;
-      plan.products = this.template.products;
 
-      for await (const el of this.plans) {
-        if (el.sell) {
-          const {
-            meta: { requiredConfiguration },
-          } = await api.post(`/sp/${uuid}/invoke`, {
+      const enabledPlans = this.plans.filter((el) => el.sell);
+      const configurations = await Promise.all(
+        enabledPlans.map((el) =>
+          api.post(`/sp/${uuid}/invoke`, {
             method: "get_required_configuration",
             params: {
               planCode: el.planCode,
               duration: el.duration,
               pricingMode: el.duration === "P1M" ? "default" : "upfront12",
             },
-          });
-
-          const addons = this.getAddons(el)
-            ? this.getAddons(el)
-                .filter((addon) => addon.sell)
-                ?.map((el) => ({ id: el.planCode, title: el.name }))
-            : plan.products[el.id]?.meta.addons;
-
-          const datacenter =
-            requiredConfiguration.find((el) => el.label.includes("datacenter"))
-              ?.allowedValues ?? [];
-
-          const os =
-            requiredConfiguration.find((el) => el.label.includes("os"))
-              ?.allowedValues ?? [];
-
-          plan.products[el.id] = {
-            kind: "PREPAID",
-            title: el.name,
-            price: el.value,
-            period: this.getPeriod(el.duration),
-            sorter: Object.keys(plan.products).length,
-            installation_fee: el.installation_fee.value,
-            meta: { addons, datacenter, os },
-          };
-        }
+          })
+        )
+      );
+
+      for (let i = 0; i < configurations.length; i++) {
+        const {
+          meta: { requiredConfiguration },
+        } = configurations[i];
+        const el = enabledPlans[i];
+
+        const addons = this.getAddons(el)
+          ? this.getAddons(el)
+              .filter((addon) => addon.sell)
+              ?.map((el) => ({ id: el.planCode, title: el.name }))
+          : plan.products[el.id]?.meta.addons;
+
+        const datacenter =
+          requiredConfiguration.find((el) => el.label.includes("datacenter"))
+            ?.allowedValues ?? [];
+
+        const os =
+          requiredConfiguration.find((el) => el.label.includes("os"))
+            ?.allowedValues ?? [];
+
+        plan.products[el.id] = {
+          kind: "PREPAID",
+          title: el.name,
+          price: el.value,
+          group: el.group,
+          period: this.getPeriod(el.duration),
+          sorter: Object.keys(plan.products).length,
+          installation_fee: el.installation_fee.value,
+          meta: { addons, datacenter, os },
+        };
       }
       Object.values(this.addons).forEach((planCodeAddons) => {
         planCodeAddons.forEach((el) => {
@@ -387,7 +410,8 @@ export default {
                 const menuWidth = menu.offsetWidth;
                 let marginLeft = 20;
 
-                if (width < menuWidth + x) marginLeft = width - (menuWidth + x) - 35;
+                if (width < menuWidth + x)
+                  marginLeft = width - (menuWidth + x) - 35;
                 const marginTop = marginLeft < 20 ? 20 : 0;
 
                 menu.style.left = `${x + marginLeft + window.scrollX}px`;
@@ -413,21 +437,24 @@ export default {
           const isYearly = duration === "P1Y" && pricingMode === "upfront12";
 
           if (isMonthly || isYearly) {
-            const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+            const newPrice = this.convertPrice(price.value);
+
             const id = tariff
               ? this.getAddonId({ planCode, duration, tariff })
               : this.getTarrifId({ planCode, duration });
 
-            const installation = prices.find((price) =>
-              price.capacities.includes("installation") && price.pricingMode === pricingMode
+            const installation = prices.find(
+              (price) =>
+                price.capacities.includes("installation") &&
+                price.pricingMode === pricingMode
             );
 
             result.push({
               planCode,
               duration,
               installation_fee: {
-                price: { value: +(installation.price.value * this.rate).toFixed(2) },
-                value: installation.price.value
+                price: { value: +this.convertPrice(installation.price.value) },
+                value: installation.price.value,
               },
               price: { value: newPrice },
               name: productName,
@@ -488,13 +515,6 @@ export default {
           return "yearly";
       }
     },
-    getName({ name, group }) {
-      const newGroup = `${group[0].toUpperCase()}${group.slice(1)}`;
-      const sep = /[\W0-9]/.exec(name)[0];
-      const newName = name.split(sep).splice(1).join(sep);
-
-      return `${newGroup}${sep}${newName}`;
-    },
     getMargin({ value, price }, filter = true) {
       if (!this.usedFee.ranges) {
         if (filter) this.changeFilters({ margin: "none" }, ["Margin"]);
@@ -555,7 +575,6 @@ export default {
       this.plans.forEach((plan, index) => {
         if (plan.group !== group) return;
         this.plans[index].group = this.newGroup.name;
-        this.plans[index].name = this.getName(plan);
       });
 
       this.changeMode("none", { id: -1, group: "" });
@@ -563,7 +582,6 @@ export default {
     createGroup(plan) {
       this.groups.push(this.newGroup.name);
       plan.group = this.newGroup.name;
-      plan.name = this.getName(plan);
 
       this.changeMode("none", { id: -1, group: "" });
     },
@@ -572,7 +590,6 @@ export default {
       this.plans.forEach((plan, i) => {
         if (plan.group !== group) return;
         this.plans[i].group = this.groups[0];
-        this.plans[i].name = this.getName(plan);
       });
     },
     changeMode(mode, { id, group }) {
@@ -603,11 +620,13 @@ export default {
         return result.every((el) => el);
       });
     },
+    convertPrice(price) {
+      return (price * this.plnRate).toFixed(2);
+    },
   },
   created() {
     this.$emit("changeLoading");
 
-    this.fetchRate();
     api.servicesProviders
       .action({
         action: "get_baremetal_plans",
@@ -644,6 +663,17 @@ export default {
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    plnRate() {
+      if (this.defaultCurrency === "PLN") {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.from === "PLN" && r.to === this.defaultCurrency
+      )?.rate;
+    },
   },
   watch: {
     plans() {
@@ -655,18 +685,18 @@ export default {
         this.plans.forEach((plan, i) => {
           const product = this.template.products[plan.id];
           const title = (product?.title ?? plan.name).toUpperCase();
-          const group = title.split(/[\W0-9]/)[0];
+          const group = product?.group || title.split(/[\W0-9]/)[0];
 
           if (product) {
             this.plans[i].name = product.title;
             this.plans[i].value = product.price;
-            this.plans[i].group = group;
             this.plans[i].sell = true;
             this.plans[i].isBeenSell = true;
           } else {
             this.plans[i].name = title;
-            this.plans[i].group = group;
           }
+          this.plans[i].group = group;
+
           if (!this.groups.includes(group)) this.groups.push(group);
         });
 
diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 1b2cf4e3a..706b4bd31 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -92,7 +92,6 @@
                 style="width: 200px"
                 v-model="item.group"
                 :items="groups"
-                @change="item.name = getName(item)"
               />
               <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
               <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
@@ -113,7 +112,12 @@
             {{ value }} {{ defaultCurrency }}
           </template>
           <template v-slot:[`item.value`]="{ item }">
-            <v-text-field dense style="width: 150px" v-model="item.value" />
+            <v-text-field
+              dense
+              style="width: 200px"
+              :suffix="defaultCurrency"
+              v-model="item.value"
+            />
           </template>
           <template v-slot:[`item.sell`]="{ item }">
             <v-switch v-model="item.sell" />
@@ -161,7 +165,12 @@
             {{ value }} {{ defaultCurrency }}
           </template>
           <template v-slot:[`item.value`]="{ item }">
-            <v-text-field dense style="width: 150px" v-model="item.value" />
+            <v-text-field
+              dense
+              style="width: 200px"
+              :suffix="defaultCurrency"
+              v-model="item.value"
+            />
           </template>
           <template v-slot:[`item.sell`]="{ item }">
             <v-switch v-model="item.sell" />
@@ -198,7 +207,6 @@
 <script>
 import api from "@/api.js";
 import nocloudTable from "@/components/table.vue";
-import currencyRate from "@/mixins/currencyRate";
 import { getMarginedValue } from "@/functions";
 
 export default {
@@ -281,7 +289,6 @@ export default {
     tabsIndex: 0,
     usedFee: {},
   }),
-  mixins: [currencyRate],
   methods: {
     changeImage(value) {
       const i = this.images.indexOf(value);
@@ -309,6 +316,7 @@ export default {
             kind: "PREPAID",
             title: el.name,
             price: el.value,
+            group: el.group,
             period: this.getPeriod(el.duration),
             resources: { cpu: +cpu, ram: ram * 1024, disk: disk * 1024 },
             sorter: Object.keys(plan.products).length,
@@ -390,7 +398,7 @@ export default {
           if (isMonthly || isYearly) {
             const code = planCode.split("-").slice(1).join("-");
             const option = windows.find((el) => el.planCode.includes(code));
-            const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+            const newPrice = this.convertPrice(price.value);
 
             const { configurations, addonFamilies } = catalog.plans.find(
               ({ planCode }) => planCode.includes(code)
@@ -410,7 +418,7 @@ export default {
                 (el) =>
                   el.duration === duration && el.pricingMode === pricingMode
               );
-              const newPrice = parseFloat((value * this.rate).toFixed(2));
+              const newPrice = this.convertPrice(value);
 
               plan.windows = {
                 value,
@@ -467,7 +475,7 @@ export default {
             const isYearly = duration === "P1Y" && pricingMode === "upfront12";
 
             if (isMonthly || isYearly) {
-              const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+              const newPrice = this.convertPrice(price.value);
 
               result.push({
                 price: { value: newPrice },
@@ -533,15 +541,6 @@ export default {
           return "yearly";
       }
     },
-    getName({ name, group }) {
-      const newGroup = `${group[0].toUpperCase()}${group.slice(1)}`;
-      const slicedName = name.replace(/VPS[\W0-9]/, "");
-      const sep = /[\W0-9]/.exec(slicedName)[0];
-      const newName = slicedName.split(sep).splice(1).join(sep);
-
-      if (!name.startsWith("VPS")) return `${newGroup}${sep}${newName}`;
-      else return `VPS ${newGroup} ${name.split(" ").at(-1)}`;
-    },
     getMargin({ value, price }, filter = true) {
       if (!this.usedFee.ranges) {
         if (filter) this.changeFilters({ margin: "none" }, ["Margin"]);
@@ -602,7 +601,6 @@ export default {
       this.plans.forEach((plan, index) => {
         if (plan.group !== group) return;
         this.plans[index].group = this.newGroupName;
-        this.plans[index].name = this.getName(plan);
       });
 
       this.changeMode("none", { id: -1, group: "" });
@@ -610,7 +608,6 @@ export default {
     createGroup(plan) {
       this.groups.push(this.newGroupName);
       plan.group = this.newGroupName;
-      plan.name = this.getName(plan);
 
       this.changeMode("none", { id: -1, group: "" });
     },
@@ -619,7 +616,6 @@ export default {
       this.plans.forEach((plan, i) => {
         if (plan.group !== group) return;
         this.plans[i].group = this.groups[0];
-        this.plans[i].name = this.getName(plan);
       });
     },
     changeMode(mode, { id, group }) {
@@ -680,12 +676,13 @@ export default {
         return p;
       });
     },
+    convertPrice(price) {
+      return (price * this.plnRate).toFixed(2);
+    },
   },
   created() {
     this.$emit("changeLoading");
 
-    this.fetchRate();
-
     api.servicesProviders
       .action({ action: "get_plans", uuid: this.sp.uuid })
       .then(({ meta }) => {
@@ -718,6 +715,17 @@ export default {
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    plnRate() {
+      if (this.defaultCurrency === "PLN") {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.to === this.defaultCurrency && r.from === "PLN"
+      )?.rate;
+    },
   },
   watch: {
     tabsIndex(value) {
@@ -748,7 +756,7 @@ export default {
             el.includes("windows")
           );
           const title = (product?.title ?? plan.name).replace(/VPS[\W0-9]/, "");
-          const group = title.split(/[\W0-9]/)[0];
+          const group = product?.group || title.split(/[\W0-9]/)[0];
 
           if (product) {
             this.plans[i].name = product.title;
diff --git a/admin-ui/src/components/plans_products_table.vue b/admin-ui/src/components/plans_products_table.vue
index b3c26a731..d8f4195d6 100644
--- a/admin-ui/src/components/plans_products_table.vue
+++ b/admin-ui/src/components/plans_products_table.vue
@@ -72,6 +72,7 @@
             <v-text-field
               dense
               type="number"
+              :suffix="defaultCurrency"
               :value="item.price"
               :rules="generalRule"
               @change="(value) => changeProduct('price', value, item.id)"
@@ -96,6 +97,33 @@
               @change="(value) => changeProduct('sorter', value, item.id)"
             />
           </template>
+          <template v-slot:[`item.group`]="{ item }">
+            <div class="d-flex align-center">
+              <v-select
+                v-if="productId !== item.id"
+                :items="[...groups.values()]"
+                :value="products[item.key].group"
+                @change="setGroup($event, item.id)"
+              />
+              <v-text-field v-else v-model="groupActionPayload" />
+              <template v-if="productId !== item.id">
+                <v-btn icon @click="setGroupAction('edit', products[item.key])">
+                  <v-icon>mdi-pencil</v-icon>
+                </v-btn>
+                <v-btn icon @click="setGroupAction('add', products[item.key])">
+                  <v-icon>mdi-plus</v-icon>
+                </v-btn>
+              </template>
+              <template v-else>
+                <v-btn icon @click="setGroupAction('')">
+                  <v-icon>mdi-cancel</v-icon>
+                </v-btn>
+                <v-btn icon @click="invokeGroupAction(item)">
+                  <v-icon>mdi-content-save</v-icon>
+                </v-btn>
+              </template>
+            </div>
+          </template>
           <template v-slot:[`item.kind`]="{ item }">
             <v-radio-group
               row
@@ -147,6 +175,7 @@
                 type="number"
                 style="width: 150px"
                 :value="item.installationFee"
+                :suffix="defaultCurrency"
                 @input="
                   (value) => changeProduct('installationFee', +value, item.id)
                 "
@@ -166,7 +195,7 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref, toRefs, watch } from "vue";
+import { onMounted, ref, toRefs, watch } from "vue";
 import { VueEditor } from "vue2-editor";
 import dateField from "@/components/date.vue";
 import JsonEditor from "@/components/JsonEditor.vue";
@@ -174,6 +203,7 @@ import nocloudTable from "@/components/table.vue";
 import plansResourcesTable from "@/components/plans_resources_table.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
 import { getFullDate } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   type: { type: String, required: true },
@@ -183,12 +213,20 @@ const props = defineProps({
 const emits = defineEmits(["change:resource", "change:product"]);
 const { products, resources } = toRefs(props);
 
+const { defaultCurrency } = useCurrency();
+
+const productsArray = ref([]);
 const table = ref();
 const fullDate = ref({});
 const selected = ref([]);
 const expanded = ref([]);
 const tabsIndex = ref(0);
 
+const groups = ref(new Map());
+const productId = ref("");
+const groupAction = ref("");
+const groupActionPayload = ref("");
+
 const generalRule = [(v) => !!v || "This field is required!"];
 const kinds = ["POSTPAID", "PREPAID"];
 const tabs = ["Products", "Resources"];
@@ -199,12 +237,15 @@ const headers = [
   { text: "Price", value: "price", width: 150 },
   { text: "Period", value: "period", width: 220 },
   { text: "Kind", value: "kind", width: 228 },
+  { text: "Group", value: "group", width: 300 },
   { text: "Public", value: "public" },
   { text: "Sorter", value: "sorter" },
 ];
 
 onMounted(() => {
+  setProductsArray();
   setFullDates(products.value);
+  setDefaultGroups();
 });
 
 function changeDate({ value }, id) {
@@ -220,7 +261,61 @@ function changeResource(data) {
   emits("change:resource", data);
 }
 
+const setProductsArray = () => {
+  productsArray.value = Object.keys(products.value).map((key) => ({
+    ...products.value[key],
+    key,
+  }));
+};
+
+const setDefaultGroups = () => {
+  for (const key in products.value) {
+    let group = products.value[key]?.group;
+    if (!group) {
+      changeProduct("group", "default", products.value[key].id);
+      group = "default";
+    }
+
+    groups.value.set(group, group);
+  }
+};
+
+const setGroupAction = (action, item) => {
+  groupAction.value = action;
+  groupActionPayload.value = item?.group || "";
+  productId.value = item?.id || "";
+};
+
+const invokeGroupAction = (item) => {
+  if (groupAction.value === "edit") {
+    changeGroupName(products.value[item.key].group, groupActionPayload.value);
+  } else {
+    setGroup(groupActionPayload.value, item.id);
+  }
+
+  setGroupAction("");
+};
+
+const changeGroupName = (group, newGroup) => {
+  for (const key in products.value) {
+    if (products.value[key].group === group) {
+      changeProduct("group", newGroup, products.value[key].id);
+    }
+  }
+
+  groups.value.delete(group);
+  groups.value.set(newGroup, newGroup);
+  setProductsArray();
+};
+
+const setGroup = (group, id) => {
+  changeProduct("group", group, id);
+  groups.value.set(group, group);
+  setProductsArray();
+};
+
 const copyProducts = () => {
+  setProductsArray();
   const copiedProducts = [
     ...selected.value.map((p) => ({
       ...p,
@@ -246,30 +341,23 @@ const copyProducts = () => {
 };
 
 function addConfig() {
-  const value = [...productsArray.value];
-  const result = {};
-
-  value.push({
+  const result = { ...products.value };
+  result[""] = {
     key: "",
     title: "",
     kind: "POSTPAID",
     price: 0,
+    group: groups.value.values().next().value,
     period: 0,
     resources: {},
     public: true,
     meta: {},
-    sorter: value.length,
+    sorter: Object.keys(result).length,
     id: Math.random().toString(16).slice(2),
-  });
+  };
 
-  value.forEach((product, i) => {
-    const { key } = product;
-
-    delete product.key;
-    product.sorter = i;
-    result[key] = product;
-  });
   changeProduct("products", result);
+  setProductsArray();
 }
 
 function removeConfig() {
@@ -294,10 +382,6 @@ const setFullDates = (products) => {
   });
 };
 
-const productsArray = computed(() =>
-  Object.entries(products.value).map(([key, value]) => ({ key, ...value }))
-);
-
 watch(table, (value) => {
   const { rows } = value[0].$el.children[1].children[0];
   const allElements = Object.values(rows).slice(1);
@@ -364,6 +448,13 @@ watch(table, (value) => {
     });
   });
 });
+watch(
+  products,
+  () => {
+    setProductsArray();
+  },
+  { deep: true }
+);
 </script>
 
 <style lang="scss">
diff --git a/admin-ui/src/components/plans_resources_table.vue b/admin-ui/src/components/plans_resources_table.vue
index f369eaeaa..2178f372d 100644
--- a/admin-ui/src/components/plans_resources_table.vue
+++ b/admin-ui/src/components/plans_resources_table.vue
@@ -37,6 +37,7 @@
         <v-text-field
           dense
           type="number"
+          :suffix="defaultCurrency"
           :value="item.price"
           :rules="generalRule"
           @input="(value) => changeResource('price', value, item.id)"
@@ -94,9 +95,8 @@ import { ref, toRefs } from "vue";
 import nocloudTable from "@/components/table.vue";
 import dateField from "@/components/date.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
-import {
-  getFullDate,
-} from "@/functions";
+import { getFullDate } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   resources: { type: Array, required: true },
@@ -104,6 +104,8 @@ const props = defineProps({
 const emits = defineEmits(["change:resource"]);
 const { resources } = toRefs(props);
 
+const { defaultCurrency } = useCurrency();
+
 const fullDates = ref({});
 const selected = ref([]);
 const expanded = ref([]);
@@ -161,4 +163,4 @@ function removeConfig() {
 resources.value.forEach(({ period, id }) => {
   fullDates.value[id] = getFullDate(period);
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 6c2916442..d9e0df158 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -1,11 +1,19 @@
 <template>
   <v-card elevation="0" color="background-light" class="pa-4">
-    <v-row>
+    <v-row v-if="showDates">
       <div style="max-width: 300px" class="mx-3">
-        <date-picker label="from" v-model="durationFilter.from" />
+        <date-picker
+          label="from"
+          :value="duration.from"
+          @input="emit('input:duration', { ...duration, from: $event })"
+        />
       </div>
       <div style="max-width: 300px" class="mx-3">
-        <date-picker label="to" v-model="durationFilter.to" />
+        <date-picker
+          label="to"
+          :value="duration.to"
+          @input="emit('input:duration', { ...duration, to: $event })"
+        />
       </div>
     </v-row>
     <nocloud-table
@@ -37,27 +45,18 @@
         <span>{{ new Date(value * 1000).toLocaleString() }}</span>
       </template>
       <template v-slot:[`item.service`]="{ value }">
-        <router-link
-          v-if="getService(value)"
-          :to="{ name: 'Service', params: { serviceId: value } }"
-        >
-          {{ getService(value).title }}
+        <router-link :to="{ name: 'Service', params: { serviceId: value } }">
+          {{ getService(value)?.title || value }}
         </router-link>
       </template>
       <template v-slot:[`item.instance`]="{ value }">
-        <router-link
-          v-if="getInstance(value)"
-          :to="{ name: 'Instance', params: { instanceId: value } }"
-        >
-          {{ getInstance(value).title }}
+        <router-link :to="{ name: 'Instance', params: { instanceId: value } }">
+          {{ getInstance(value)?.title || value }}
         </router-link>
       </template>
       <template v-slot:[`item.account`]="{ value }">
-        <router-link
-          v-if="getAccount(value)"
-          :to="{ name: 'Account', params: { accountId: value } }"
-        >
-          {{ getAccount(value).title }}
+        <router-link :to="{ name: 'Account', params: { accountId: value } }">
+          {{ getAccount(value)?.title || value }}
         </router-link>
       </template>
     </nocloud-table>
@@ -79,8 +78,13 @@ const props = defineProps({
   hideService: { type: Boolean, default: false },
   selectRecord: { type: Function, default: () => {} },
   tableName: { type: String },
+  showDates: { type: Boolean, default: false },
+  duration: { type: Object, default: () => ({ from: null, to: null }) },
 });
-const { filters, hideInstance, hideService, hideAccount } = toRefs(props);
+const { filters, hideInstance, hideService, hideAccount, duration, showDates } =
+  toRefs(props);
+
+const emit = defineEmits(["input:unique", "input:duration"]);
 
 const store = useStore();
 const { rates, convertFrom, defaultCurrency } = useCurrency();
@@ -93,7 +97,6 @@ const isCountLoading = ref(false);
 const fetchError = ref("");
 const options = ref({});
 const itemsPerPageOptions = ref([5, 10, 15, 25]);
-const durationFilter = ref({ to: "", from: "" });
 
 const reportsHeaders = computed(() => {
   const headers = [
@@ -102,6 +105,7 @@ const reportsHeaders = computed(() => {
     { text: "Total", value: "totalPreview" },
     { text: "Total in default currency", value: "totalDefaultPreview" },
     { text: "Product or resource", value: "item" },
+    { text: "Type", value: "type" },
   ];
 
   if (!hideAccount.value) {
@@ -126,16 +130,16 @@ const isLoading = computed(() => {
 });
 
 const requestOptions = computed(() => ({
-  ...filters.value,
+  filters: filters.value,
   page: page.value,
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],
   sort: options.value.sortBy[0] && options.value.sortDesc[0] ? "DESC" : "ASC",
-  from: durationFilter.value.from
-    ? new Date(durationFilter.value.from).getTime() / 1000
+  from: duration.value.from
+    ? new Date(duration.value.from).getTime() / 1000
     : undefined,
-  to: durationFilter.value.to
-    ? new Date(durationFilter.value.to).getTime() / 1000
+  to: duration.value.to
+    ? new Date(duration.value.to).getTime() / 1000
     : undefined,
 }));
 
@@ -162,6 +166,7 @@ const onUpdateOptions = async (newOptions) => {
         service: r.service,
         instance: r.instance,
         account: r.account,
+        type: r.meta.transactionType,
         totalDefault: convertFrom(r.total, r.currency),
       };
     });
@@ -185,7 +190,9 @@ const setOptions = (newOptions) => {
 const init = async () => {
   isCountLoading.value = true;
   try {
-    count.value = +(await api.reports.count(requestOptions.value)).total;
+    const { total, unique } = await api.reports.count(requestOptions.value);
+    count.value = +total;
+    emit("input:unique", unique);
   } finally {
     isCountLoading.value = false;
   }
@@ -203,7 +210,7 @@ watch(rates, () => {
 });
 
 watch(
-  durationFilter,
+  duration,
   () => {
     onUpdateOptions(options.value);
   },
diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index fab4f25a5..533dc15ac 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -32,14 +32,17 @@
           </template>
 
           <template v-slot:append>
-            <search-tag
-              v-if="customParamsValues.length"
-              :param="customParamsValues[0]"
-              :variants="variants"
-            />
+            <div class="d-flex" v-if="customParamsValues.length">
+              <search-tag
+                v-for="param in showedCustomParams"
+                :key="param.value"
+                :param="param"
+                :variants="variants"
+              />
+            </div>
             <v-menu
               :close-on-content-click="false"
-              v-if="customParamsValues.length > 1"
+              v-if="filteredCustomParamsValues.length > 1"
               offset-y
               min-height="300px"
               max-height="300px"
@@ -54,7 +57,7 @@
                   outlined
                   v-on="on"
                 >
-                  +{{ customParamsValues.length - 1 }}
+                  +{{ filteredCustomParamsValues.length }}
                 </v-chip>
               </template>
               <v-card class="px-3" color="background-light">
@@ -102,13 +105,13 @@
                       {{ searchParam || "" }}
                     </span>
                     <div>
-                      <span> in {{ item.title }} </span>
+                      <span> {{ item.title }} </span>
                       <v-btn
                         v-if="variants[item.key].items"
                         @click.stop="selectGroup(item)"
                         icon
                       >
-                        <v-icon>mdi-magnify</v-icon>
+                        <v-icon>mdi-arrow-right</v-icon>
                       </v-btn>
                     </div>
                   </div>
@@ -168,6 +171,7 @@ export default {
       }
       if (isSearchParam) {
         this.close();
+        this.searchParam = "";
       }
     },
     setEntity(index) {
@@ -201,7 +205,7 @@ export default {
         },
       });
 
-      this.close();
+      this.searchParam = "";
     },
     selectGroup({ key }) {
       this.selectedGroupKey = key;
@@ -289,11 +293,34 @@ export default {
 
       return values;
     },
+    showedCustomParams() {
+      const showed = [];
+      const maxLength = Math.floor(((window.innerWidth / 12) * 6) / 15);
+      let currLength = 0;
+
+      for (const param of this.customParamsValues) {
+        const title = param.isArray
+          ? `${this.variants[param.key]?.title || ""}:${param?.title}`
+          : param.title;
+        if (title.length + currLength < maxLength) {
+          currLength += title.length;
+          showed.push(param);
+        } else {
+          break;
+        }
+      }
+
+      return showed;
+    },
     filteredCustomParamsValues() {
+      const params = this.customParamsValues.filter(
+        (a, i) => i > this.showedCustomParams.length
+      );
+
       if (!this.tagsSearchParam) {
-        return this.customParamsValues;
+        return params;
       }
-      return this.customParamsValues.filter((c) =>
+      return params.filter((c) =>
         c.title.toLowerCase().includes(this.tagsSearchParam.toLowerCase())
       );
     },
diff --git a/admin-ui/src/components/service-create.vue b/admin-ui/src/components/service-create.vue
index baca020a5..6c8d76746 100644
--- a/admin-ui/src/components/service-create.vue
+++ b/admin-ui/src/components/service-create.vue
@@ -69,7 +69,11 @@
             :items="fileTypes"
             v-model="selectedFileType"
           />
-          <v-btn class="mr-3" @click="downloadFile">Download</v-btn>
+          <download-template-button
+            :template="getService()"
+            :type="selectedFileType"
+            :name="downloadedFileName"
+          />
           <upload-file-button
             @file="uploadFile"
             :accept="selectedFileType.toLowerCase()"
@@ -192,16 +196,15 @@ import snackbar from "@/mixins/snackbar.js";
 
 import {
   defaultFilterObject,
-  downloadJSONFile,
-  downloadYAMLFile,
   readJSONFile,
   readYAMLFile,
 } from "@/functions.js";
 import UploadFileButton from "@/components/uploadFileButton.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "service-create",
-  components: { UploadFileButton },
+  components: { DownloadTemplateButton, UploadFileButton },
   data: () => ({
     formValid: false,
     rules: {
@@ -394,18 +397,6 @@ export default {
         this.plans.products.push(title);
       });
     },
-    downloadFile() {
-      const data = this.getService();
-      const name = data.service.title
-        ? (data.service.title + " service").replaceAll(" ", "_")
-        : "unknown_service";
-
-      if (this.selectedFileType === "JSON") {
-        downloadJSONFile(data, name);
-      } else if (this.selectedFileType === "YAML") {
-        downloadYAMLFile(data, name);
-      }
-    },
     async uploadFile(file) {
       let data = {};
       if (this.selectedFileType === "JSON") {
@@ -446,6 +437,12 @@ export default {
     planRules() {
       return this.plansVisible ? this.rules.req : [];
     },
+    downloadedFileName() {
+      const data = this.getService();
+      return data.service.title
+        ? (data.service.title + " service").replaceAll(" ", "_")
+        : "unknown_service";
+    },
   },
   created() {
     this.$store.dispatch("services/fetch").then(({ pool }) => {
diff --git a/admin-ui/src/components/service/reports.vue b/admin-ui/src/components/service/reports.vue
index 79c2d151f..4511f9838 100644
--- a/admin-ui/src/components/service/reports.vue
+++ b/admin-ui/src/components/service/reports.vue
@@ -4,16 +4,21 @@
     hide-account
     hide-service
     :filters="filters"
+    show-dates
+    :duration="duration"
+    @input:duration="duration = $event"
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["service"]);
 const { service } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     service: [service.value.uuid],
diff --git a/admin-ui/src/components/showcases_table.vue b/admin-ui/src/components/showcases_table.vue
index e7f43c3c2..10af353f5 100644
--- a/admin-ui/src/components/showcases_table.vue
+++ b/admin-ui/src/components/showcases_table.vue
@@ -17,6 +17,16 @@
         {{ item.title }}
       </router-link>
     </template>
+
+    <template v-slot:[`item.public`]="{ item }">
+      <v-skeleton-loader v-if="updatedShowcase === item.uuid" type="text" />
+      <v-switch
+        v-else
+        :readonly="!!updatedShowcase"
+        :input-value="item.public"
+        @change="changeEnabled(item, $event)"
+      />
+    </template>
   </nocloud-table>
 </template>
 
@@ -24,17 +34,39 @@
 import NocloudTable from "@/components/table.vue";
 import IconTitlePreview from "@/components/ui/iconTitlePreview.vue";
 import { ref, toRefs } from "vue";
+import api from "@/api";
+import { useStore } from "@/store";
 
 const props = defineProps(["items", "loading", "value"]);
 const emits = defineEmits(["input"]);
 
 const { value, loading, items } = toRefs(props);
 
+const store = useStore();
+
+const updatedShowcase = ref("");
+
 const headers = ref([
-  { text: "uuid", value: "uuid" },
-  { text: "title", value: "title" },
-  { text: "preview", value: "preview" },
+  { text: "UUID", value: "uuid" },
+  { text: "Title", value: "title" },
+  { text: "Preview", value: "preview" },
+  { text: "Enabled", value: "public" },
 ]);
+
+const changeEnabled = async (item, value) => {
+  try {
+    updatedShowcase.value = item.uuid;
+    const data = { ...item, public: value };
+    await api.showcases.update(data);
+    store.commit("showcases/replaceShowcase", data);
+  } catch {
+    store.commit("snackbar/showSnackbarError", {
+      message: "Error during update showcase enabled",
+    });
+  } finally {
+    updatedShowcase.value = "";
+  }
+};
 </script>
 
 <style scoped></style>
diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
index f6da499aa..d32cc247e 100644
--- a/admin-ui/src/components/ui/billingLabel.vue
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -1,10 +1,21 @@
 <template>
   <v-container>
-    <v-row>
-      <v-col>
-        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
+    <v-row justify="end">
+      <v-col
+        style="max-height: 50px"
+        class="d-flex justify-end align-start pa-0"
+      >
+        <v-switch
+          hide-details
+          dense
+          :input-value="template.config.auto_renew"
+          @change="
+            emit('update', { key: 'config.auto_renew', value: !!$event })
+          "
+          label="Auto"
+        />
       </v-col>
-      <v-col>
+      <v-col class="d-flex justify-end" style="max-width: 120px">
         <confirm-dialog
           title="Do you want to renew server?"
           :text="renewTemplate"
@@ -23,13 +34,16 @@
       </v-col>
     </v-row>
     <v-row class="mt-0" align="center" justify="end">
-      <v-col class="d-flex justify-end">
+      <v-col class="d-flex justify-end px-1">
+        <instance-state :state="template.state.state" />
+      </v-col>
+      <v-col class="d-flex justify-end px-1">
         <v-chip color="primary" outlined
           >Price: {{ price }} {{ accountCurrency }}</v-chip
         >
       </v-col>
-      <v-col class="d-flex justify-end">
-        <instance-state :state="template.state.state" />
+      <v-col class="px-1">
+        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
       </v-col>
     </v-row>
   </v-container>
@@ -49,11 +63,12 @@ const props = defineProps([
   "tariffPrice",
   "account",
 ]);
+const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
 
-const store = useStore();
-const { convertFrom } = useCurrency();
+const emit = defineEmits(["update"]);
 
-const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
+const store = useStore();
+const { convertTo } = useCurrency();
 
 const currency = computed(() => ({
   code: store.getters["currencies/default"],
@@ -64,9 +79,9 @@ const accountCurrency = computed(() => {
 });
 
 const price = computed(() => {
-  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b);
+  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b, 0);
 
-  return convertFrom(tariffPrice.value + addonsSum, accountCurrency.value);
+  return convertTo(tariffPrice.value + addonsSum, accountCurrency.value);
 });
 
 const isRenewDisabled = computed(() => {
@@ -119,4 +134,4 @@ const renewTemplate = `
     `.trim();
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>
diff --git a/admin-ui/src/components/ui/datePicker.vue b/admin-ui/src/components/ui/datePicker.vue
index ad1152601..76b6832df 100644
--- a/admin-ui/src/components/ui/datePicker.vue
+++ b/admin-ui/src/components/ui/datePicker.vue
@@ -11,6 +11,7 @@
         prepend-inner-icon="mdi-calendar"
         :value="value"
         readonly
+        :dense="dense"
         :label="label"
       />
     </template>
@@ -26,8 +27,13 @@
 <script setup>
 import { toRefs } from "vue";
 
-const props = defineProps(["value", "min", "label"]);
-const { value, min, label } = toRefs(props);
+const props = defineProps({
+  value: {},
+  min: {},
+  label: {},
+  dense: { type: Boolean, default: false },
+});
+const { value, min, label, dense } = toRefs(props);
 
 const emits = defineEmits(["input"]);
 </script>
diff --git a/admin-ui/src/components/ui/downloadTemplateButton.vue b/admin-ui/src/components/ui/downloadTemplateButton.vue
new file mode 100644
index 000000000..884eb7817
--- /dev/null
+++ b/admin-ui/src/components/ui/downloadTemplateButton.vue
@@ -0,0 +1,26 @@
+<template>
+  <v-btn class="mr-2" @click="downloadFile" :disabled="disabled">
+    Download {{ isJson ? "JSON" : "YAML" }}
+  </v-btn>
+</template>
+
+<script setup>
+import { downloadJSONFile, downloadYAMLFile } from "@/functions";
+import { computed, toRefs } from "vue";
+
+const props = defineProps(["name", "template", "type", "disabled"]);
+const { name, template, type, disabled } = toRefs(props);
+
+const isJson = computed(() => {
+  return type.value === "JSON";
+});
+
+const downloadFile = () => {
+  const params = [template.value, name.value];
+  if (isJson.value) {
+    downloadJSONFile(...params);
+  } else {
+    downloadYAMLFile(...params);
+  }
+};
+</script>
diff --git a/admin-ui/src/components/ui/instancesPricesPanels.vue b/admin-ui/src/components/ui/instancesPricesPanels.vue
new file mode 100644
index 000000000..be3717d6d
--- /dev/null
+++ b/admin-ui/src/components/ui/instancesPricesPanels.vue
@@ -0,0 +1,21 @@
+<template>
+  <v-expansion-panels>
+    <v-expansion-panel>
+      <v-expansion-panel-header color="background-light">
+        <span style="color: rgb(255, 0, 255)" class="text-h6">Prices</span>
+        <template v-slot:actions>
+          <v-icon color="primary" x-large> $expand </v-icon>
+        </template>
+      </v-expansion-panel-header>
+      <v-expansion-panel-content color="background-light">
+        <slot />
+      </v-expansion-panel-content>
+    </v-expansion-panel>
+  </v-expansion-panels>
+</template>
+
+<script>
+export default {
+  name: "instancesPricesPanels",
+};
+</script>
diff --git a/admin-ui/src/components/ui/loginInAccountIcon.vue b/admin-ui/src/components/ui/loginInAccountIcon.vue
index 4e37c8452..cd5585f87 100644
--- a/admin-ui/src/components/ui/loginInAccountIcon.vue
+++ b/admin-ui/src/components/ui/loginInAccountIcon.vue
@@ -3,7 +3,6 @@
 </template>
 
 <script setup>
-import api from "@/api";
 import { useStore } from "@/store";
 
 const props = defineProps(["uuid", "instanceId", "type"]);
@@ -13,7 +12,7 @@ const loginHandler = () => {
   store
     .dispatch("auth/loginToApp", { uuid: props.uuid, type: "whmcs" })
     .then(({ token }) => {
-      api.settings.get(["app"]).then((res) => {
+      store.dispatch('auth/getAppURL').then((res) => {
         const win = window.open(JSON.parse(res.app).url);
 
         window.addEventListener('message', () => {
diff --git a/admin-ui/src/hooks/useAccountConverter.js b/admin-ui/src/hooks/useAccountConverter.js
deleted file mode 100644
index b5e3c7384..000000000
--- a/admin-ui/src/hooks/useAccountConverter.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import api from "@/api";
-import { computed, ref, watch } from "vue";
-import { useStore } from "@/store";
-
-const useAccountConverter = (instance) => {
-  const store = useStore();
-
-  const accountRate = ref(0);
-
-  const namespace = computed(() =>
-    store.getters["namespaces/all"]?.find(
-      (n) => n.uuid === instance.access.namespace
-    )
-  );
-
-  const account = computed(() => {
-    if (!namespace.value) {
-      return;
-    }
-    return store.getters["accounts/all"]?.find(
-      (a) => a?.uuid === namespace.value.access.namespace
-    );
-  });
-
-  const accountCurrency = computed(() => account.value.currency);
-
-  const defaultCurrency = computed(() => {
-    return store.getters["currencies/default"];
-  });
-
-  const toAccountPrice = (price) => {
-    return accountRate.value ? (price / accountRate.value).toFixed(2) : 0;
-  };
-  const fromAccountPrice = (price) => {
-    return accountRate.value ? (price * accountRate.value).toFixed(2) : 0;
-  };
-
-  const fetchAccountRate = async () => {
-    if (!account.value.currency || !defaultCurrency.value) {
-      return;
-    }
-    if (account.value.currency === defaultCurrency.value) {
-      accountRate.value = 1;
-      return;
-    }
-    const res = await api.get(
-      `/billing/currencies/rates/${account.value.currency}/${defaultCurrency.value}`
-    );
-    accountRate.value = res.rate;
-  };
-
-  watch(accountCurrency, () => {
-    fetchAccountRate();
-  });
-
-  watch(defaultCurrency, () => {
-    fetchAccountRate();
-  });
-
-  return {
-    toAccountPrice,
-    fromAccountPrice,
-    fetchAccountRate,
-    account,
-    accountCurrency,
-    accountRate,
-  };
-};
-
-export default useAccountConverter;
diff --git a/admin-ui/src/hooks/useCurrency.js b/admin-ui/src/hooks/useCurrency.js
index 5f50fb832..f34f4d4be 100644
--- a/admin-ui/src/hooks/useCurrency.js
+++ b/admin-ui/src/hooks/useCurrency.js
@@ -23,7 +23,7 @@ const useCurrency = () => {
       )?.rate;
     }
 
-    return rate ? (price / rate).toFixed(2) : 0;
+    return rate ? (price * rate).toFixed(2) : 0;
   };
 
   const convertTo = (price, currency) => {
diff --git a/admin-ui/src/hooks/useInstancePrices.js b/admin-ui/src/hooks/useInstancePrices.js
new file mode 100644
index 000000000..920110935
--- /dev/null
+++ b/admin-ui/src/hooks/useInstancePrices.js
@@ -0,0 +1,50 @@
+import { computed } from "vue";
+import { useStore } from "@/store";
+import useCurrency from "@/hooks/useCurrency";
+
+const useInstancePrices = (instance) => {
+  const store = useStore();
+  const { convertFrom, convertTo, rates, defaultCurrency } = useCurrency();
+
+  const namespace = computed(() =>
+    store.getters["namespaces/all"]?.find(
+      (n) => n.uuid === instance.access.namespace
+    )
+  );
+
+  const account = computed(() => {
+    if (!namespace.value) {
+      return;
+    }
+    return store.getters["accounts/all"]?.find(
+      (a) => a?.uuid === namespace.value.access.namespace
+    );
+  });
+
+  const accountCurrency = computed(() => account.value.currency);
+  const accountRate = computed(() => {
+    if (defaultCurrency.value === accountCurrency.value) {
+      return 1;
+    }
+    return rates.value.find(
+      (r) => r.to === accountCurrency.value && r.from === defaultCurrency.value
+    );
+  });
+
+  const toAccountPrice = (price) => {
+    return convertTo(price, accountCurrency.value);
+  };
+  const fromAccountPrice = (price) => {
+    return convertFrom(price, accountCurrency.value);
+  };
+
+  return {
+    toAccountPrice,
+    fromAccountPrice,
+    account,
+    accountCurrency,
+    accountRate,
+  };
+};
+
+export default useInstancePrices;
diff --git a/admin-ui/src/mixins/currencyRate.js b/admin-ui/src/mixins/currencyRate.js
deleted file mode 100644
index cbbda7716..000000000
--- a/admin-ui/src/mixins/currencyRate.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import api from "@/api";
-
-const currencyRate = {
-  data: () => ({ rate: null }),
-  computed: {
-    defaultCurrency() {
-      return this.$store.getters["currencies/default"];
-    },
-  },
-  methods: {
-    fetchRate(currency = "PLN") {
-      api
-        .get(`/billing/currencies/rates/${currency}/${this.defaultCurrency}`)
-        .then((res) => {
-          this.rate = res.rate;
-        })
-        .catch(() =>
-          api.get(
-            `/billing/currencies/rates/${this.defaultCurrency}/${currency}`
-          )
-        )
-        .then((res) => {
-          if (res) this.rate = 1 / res.rate;
-        })
-        .catch((err) => console.error(err));
-    },
-  },
-};
-
-export default currencyRate;
diff --git a/admin-ui/src/store/appSearch.js b/admin-ui/src/store/appSearch.js
index 4fa09fb52..f70c82d3f 100644
--- a/admin-ui/src/store/appSearch.js
+++ b/admin-ui/src/store/appSearch.js
@@ -70,7 +70,7 @@ export default {
     variants(state) {
       const variants = { ...state.variants };
       if (Object.keys(variants).length) {
-        variants["searchParam"] = { title: "Anywhere", key: "searchParam" };
+        variants["searchParam"] = { title: "Other", key: "searchParam" };
       }
       return variants;
     },
diff --git a/admin-ui/src/store/auth.js b/admin-ui/src/store/auth.js
index 9dd50e584..3a828fcf3 100644
--- a/admin-ui/src/store/auth.js
+++ b/admin-ui/src/store/auth.js
@@ -9,6 +9,7 @@ export default {
   state: {
     token: "",
     userdata: {},
+    appURL: ""
   },
   mutations: {
     setToken(state, token) {
@@ -21,12 +22,14 @@ export default {
     setUserdata(state, data) {
       state.userdata = data;
     },
+    setAppURL(state, data) {
+      state.appURL = data;
+    }
   },
   actions: {
     login({ commit }, { login, password, type }) {
       return new Promise((resolve, reject) => {
-        api
-          .authorizeCustom({
+        api.authorizeCustom({
             auth: { data: [login, password], type },
             exp: Math.round((Date.now() + 7776e6) / 1000),
             root_claim: true
@@ -41,10 +44,26 @@ export default {
           });
       });
     },
+    getAppURL({ state, commit }) {
+      return new Promise((resolve, reject) => {
+        if (state.appURL !== "") {
+          resolve(state.appURL);
+          return;
+        }
+
+        api.settings.get(["app"])
+          .then((response) => {
+            commit("setAppURL", JSON.parse(response.app).url)
+            resolve(response);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
     loginToApp(_, { type, uuid }) {
       return new Promise((resolve, reject) => {
-        api
-          .authorizeCustom({ auth: { type, data: [] }, uuid })
+        api.authorizeCustom({ auth: { type, data: [] }, uuid })
           .then((response) => {
             resolve(response);
           })
diff --git a/admin-ui/src/store/showcases.js b/admin-ui/src/store/showcases.js
index 5d9e6532a..78f5b8bd9 100644
--- a/admin-ui/src/store/showcases.js
+++ b/admin-ui/src/store/showcases.js
@@ -22,6 +22,11 @@ export default {
     removeShowcase(state, uuid) {
       state.showcases = state.showcases.filter((s) => s.uuid !== uuid);
     },
+    replaceShowcase(state, value) {
+      state.showcases = state.showcases.map((s) =>
+        s.uuid === value.uuid ? value : s
+      );
+    },
     setLoading(state, data) {
       state.loading = data;
     },
diff --git a/admin-ui/src/views/AppSettings.vue b/admin-ui/src/views/AppSettings.vue
index 55b1e0799..64ca7bc80 100644
--- a/admin-ui/src/views/AppSettings.vue
+++ b/admin-ui/src/views/AppSettings.vue
@@ -10,9 +10,12 @@
           @change="onFileChange"
         />
       </div>
-      <v-btn @click="downloadSettings" color="background-light" class="mr-10"
-        >Download settings</v-btn
-      >
+      <download-template-button
+        class="mr-10"
+        :template="settings"
+        name="settings"
+        type="JSON"
+      />
     </div>
     <v-card-title class="px-0 mb-3"> Main:</v-card-title>
     <v-row>
@@ -96,12 +99,13 @@
 <script>
 import snackbar from "@/mixins/snackbar.js";
 import JsonEditor from "@/components/JsonEditor.vue";
-import { downloadJSONFile, readJSONFile } from "@/functions.js";
+import { readJSONFile } from "@/functions.js";
 import ColorPicker from "@/components/ui/colorPicker.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   key: "app-settings",
-  components: { ColorPicker, JsonEditor },
+  components: { DownloadTemplateButton, ColorPicker, JsonEditor },
   mixins: [snackbar],
   data() {
     return {
@@ -133,9 +137,6 @@ export default {
     onFileChange(file) {
       readJSONFile(file).then((res) => (this.settings = res));
     },
-    downloadSettings() {
-      downloadJSONFile(this.settings, "settings");
-    },
     edit(data) {
       this.settings = data;
     },
diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index b77d1c017..1505944ff 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -1,14 +1,11 @@
 <template>
   <div class="pa-4">
-    <v-btn class="mr-2" color="background-light" :to="{ name: 'Plans create' }">
-      Create
-    </v-btn>
+    <v-btn class="mr-2" :to="{ name: 'Plans create' }"> Create </v-btn>
 
-    <confirm-dialog v-if="linked.length < 1" @confirm="deleteSelectedPlan">
+    <confirm-dialog v-if="linked.length !== 1" @confirm="deleteSelectedPlan">
       <v-btn
         class="mr-2"
-        color="background-light"
-        :disabled="selected.length < 1"
+        :disabled="isDeleteDisabled"
         :loading="isDeleteLoading"
       >
         Delete
@@ -25,7 +22,6 @@
     >
       <v-btn
         class="mr-2"
-        color="background-light"
         :disabled="selected.length < 1"
         :loading="isDeleteLoading"
       >
@@ -72,7 +68,6 @@
 
     <nocloud-table
       table-name="plans"
-      single-select
       class="mt-4"
       :items="filtredPlans"
       :headers="headers"
@@ -99,6 +94,25 @@
           {{ instanceCountMap[item.uuid] }}
         </template>
       </template>
+
+      <template v-slot:footer.prepend>
+        <div class="d-flex align-center mt-2">
+          <v-select
+            style="width: 100px"
+            :items="fileTypes"
+            label="File type"
+            v-model="selectedFileType"
+            class="d-inline-block mx-2"
+          />
+          <download-template-button
+            class="mx-2"
+            :disabled="!selected.length"
+            name="selected_copy"
+            :type="selectedFileType"
+            :template="selected"
+          />
+        </div>
+      </template>
     </nocloud-table>
   </div>
 </template>
@@ -111,10 +125,11 @@ import nocloudTable from "@/components/table.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
 import { defaultFilterObject, filterArrayByTitleAndUuid } from "@/functions";
 import { mapGetters } from "vuex";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "plans-view",
-  components: { nocloudTable, confirmDialog },
+  components: { DownloadTemplateButton, nocloudTable, confirmDialog },
   mixins: [snackbar, search],
   data: () => ({
     headers: [
@@ -136,6 +151,9 @@ export default {
     copyed: -1,
     fetchError: "",
     serviceProvider: null,
+
+    fileTypes: ["JSON", "YAML"],
+    selectedFileType: "JSON",
   }),
   methods: {
     defaultFilterObject,
@@ -178,10 +196,12 @@ export default {
       }
 
       this.isDeleteLoading = true;
+      const deletePromises = this.selected.map((s) => api.plans.delete(s.uuid));
+
       Promise.all(promises)
-        .then(() => api.plans.delete(this.selected[0].uuid))
+        .then(() => Promise.all(deletePromises))
         .then(() => {
-          this.$store.dispatch("plans/fetch", { withCount: true });
+          this.$store.dispatch("plans/fetch");
           this.showSnackbar({
             message: "Price model deleted successfully.",
           });
@@ -292,12 +312,31 @@ export default {
     typeItems() {
       return [...new Set(this.plans.map((p) => p.type.toLowerCase()))];
     },
+    isDeleteDisabled() {
+      if (
+        !Object.keys(this.instanceCountMap).length ||
+        this.selected.length === 0
+      ) {
+        return true;
+      }
+      const withInstances = this.selected.filter(
+        (s) => this.instanceCountMap[s.uuid] > 0
+      );
+      const withOutInstances = this.selected.filter(
+        (s) => this.instanceCountMap[s.uuid] === 0
+      );
+
+      return (
+        withInstances.length > 1 ||
+        (withOutInstances.length > 0 && withInstances.length > 0)
+      );
+    },
   },
   watch: {
     plans() {
       this.fetchError = "";
     },
-    typeItems(){
+    typeItems() {
       this.$store.commit("appSearch/setVariants", {
         kind: { items: ["static", "dynamic"], title: "Kind", isArray: true },
         type: { items: this.typeItems, isArray: true, title: "Type" },
@@ -322,4 +361,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/admin-ui/src/views/PlansCreate.vue b/admin-ui/src/views/PlansCreate.vue
index 679c61f11..8bad82210 100644
--- a/admin-ui/src/views/PlansCreate.vue
+++ b/admin-ui/src/views/PlansCreate.vue
@@ -124,10 +124,11 @@
           >
             Create
           </v-btn>
-
-          <v-btn class="mr-2" @click="downloadFile">
-            Download {{ isJson ? "JSON" : "YAML" }}
-          </v-btn>
+          <download-template-button
+            :template="plan"
+            :type="isJson ? 'JSON' : 'YAML'"
+            :name="downloadedFileName"
+          />
           <v-switch
             class="d-inline-block mr-2"
             style="margin-top: 5px; padding-top: 0"
@@ -173,19 +174,18 @@ import snackbar from "@/mixins/snackbar.js";
 import confirmDialog from "@/components/confirmDialog.vue";
 import planOpensrs from "@/components/plan/opensrs/planOpensrs.vue";
 import JsonEditor from "@/components/JsonEditor.vue";
-
-import {
-  downloadJSONFile,
-  readJSONFile,
-  readYAMLFile,
-  downloadYAMLFile,
-  getTimestamp,
-} from "@/functions.js";
+import { readJSONFile, readYAMLFile, getTimestamp } from "@/functions.js";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "plansCreate-view",
   mixins: [snackbar],
-  components: { confirmDialog, planOpensrs, JsonEditor },
+  components: {
+    DownloadTemplateButton,
+    confirmDialog,
+    planOpensrs,
+    JsonEditor,
+  },
   props: { item: { type: Object }, isEdit: { type: Boolean, default: false } },
   data: () => ({
     types: [],
@@ -422,16 +422,6 @@ export default {
           });
       }
     },
-    downloadFile() {
-      const name = this.plan.title
-        ? this.plan.title.replaceAll(" ", "_")
-        : "unknown_price_model";
-      if (this.isJson) {
-        downloadJSONFile(this.plan, name);
-      } else {
-        downloadYAMLFile(this.plan, name);
-      }
-    },
   },
   created() {
     this.$store.dispatch("plans/fetch", { silent: true }).catch((err) => {
@@ -513,6 +503,11 @@ export default {
 
       return filtered;
     },
+    downloadedFileName() {
+      return this.plan.title
+        ? this.plan.title.replaceAll(" ", "_")
+        : "unknown_price_model";
+    },
   },
   watch: {
     "plan.kind"() {
diff --git a/admin-ui/src/views/ServicesProvidersCreate.vue b/admin-ui/src/views/ServicesProvidersCreate.vue
index 71141f44a..39eaa3da1 100644
--- a/admin-ui/src/views/ServicesProvidersCreate.vue
+++ b/admin-ui/src/views/ServicesProvidersCreate.vue
@@ -59,17 +59,22 @@
             </v-col>
           </v-row>
 
-          <v-row>
-            <v-col cols="3">
-              <v-subheader>Meta</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <json-editor
-                :json="provider.meta"
-                @changeValue="(data) => (provider.meta = data)"
-              />
-            </v-col>
-          </v-row>
+          <v-expansion-panels>
+            <v-expansion-panel>
+              <v-expansion-panel-header color="background-light">
+                <span class="text-h6">Meta</span>
+                <template v-slot:actions>
+                  <v-icon x-large> $expand </v-icon>
+                </template>
+              </v-expansion-panel-header>
+              <v-expansion-panel-content color="background-light">
+                <json-editor
+                  :json="provider.meta"
+                  @changeValue="(data) => (provider.meta = data)"
+                />
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </v-expansion-panels>
 
           <v-row align="center">
             <v-col cols="3">
@@ -162,9 +167,12 @@
         </v-col>
         <v-col cols="6">
           <div class="d-flex align-start justify-center">
-            <v-btn class="mr-2" @click="downloadFile">
-              Download {{ isJson ? "JSON" : "YAML" }}
-            </v-btn>
+            <download-template-button
+              :type="isJson ? 'JSON' : 'YAML'"
+              class="mr-2"
+              :template="serviceProviderBody"
+              :name="downloadedFileName"
+            />
             <v-switch
               class="mr-2"
               style="margin-top: 5px; padding-top: 5px"
@@ -192,19 +200,18 @@ import JsonEditor from "@/components/JsonEditor.vue";
 
 import {
   mergeDeep,
-  downloadJSONFile,
   readJSONFile,
   readYAMLFile,
-  downloadYAMLFile,
   toKebabCase,
   toPascalCase,
 } from "@/functions.js";
 import AntIcon from "@/components/ui/antIcon.vue";
 import IconTitlePreview from "@/components/ui/iconTitlePreview.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "servicesProviders-create",
-  components: { IconTitlePreview, AntIcon, JsonEditor },
+  components: { DownloadTemplateButton, IconTitlePreview, AntIcon, JsonEditor },
   mixins: [snackbar],
   data: () => ({
     types: [],
@@ -262,7 +269,7 @@ export default {
     this.providerKey = this.generateComponentId();
     this.fetchExtentions();
 
-    if(id){
+    if (id) {
       this.$store.dispatch("servicesProviders/fetchById", id).then((res) => {
         if (!this.types.includes(res.type)) {
           this.customTitle = res.type;
@@ -317,6 +324,11 @@ export default {
     isProxyHide() {
       return ["cpanel"].includes(this.serviceProviderBody.type);
     },
+    downloadedFileName() {
+      return this.serviceProviderBody.title
+        ? this.serviceProviderBody.title.replaceAll(" ", "_")
+        : "unknown_sp";
+    },
   },
   methods: {
     generateComponentId() {
@@ -475,16 +487,6 @@ export default {
           });
       }
     },
-    downloadFile() {
-      const name = this.serviceProviderBody.title
-        ? this.serviceProviderBody.title.replaceAll(" ", "_")
-        : "unknown_sp";
-      if (this.isJson) {
-        downloadJSONFile(this.serviceProviderBody, name);
-      } else {
-        downloadYAMLFile(this.serviceProviderBody, name);
-      }
-    },
     setIconToKebabCase(icon) {
       this.provider.meta.service.icon = toKebabCase(icon);
     },
diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 184114d23..03efaa5d6 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -1,31 +1,56 @@
 <template>
   <div class="pa-4">
-    <v-btn
-      class="mr-2"
-      color="background-light"
-      :to="{ name: 'Transactions create' }"
-    >
-      Create
-    </v-btn>
-
-    <v-autocomplete
-      :filter="defaultFilterObject"
-      label="Account"
-      item-text="title"
-      item-value="uuid"
-      class="d-inline-block mr-2"
-      v-model="accountId"
-      :items="accounts"
-    />
-    <v-autocomplete
-      :filter="defaultFilterObject"
-      label="Service"
-      item-text="title"
-      item-value="uuid"
-      class="d-inline-block"
-      v-model="serviceId"
-      :items="servicesByAccount"
-    />
+    <v-row align="start">
+      <v-col cols="1">
+        <v-btn
+          class="mr-2"
+          color="background-light"
+          :to="{ name: 'Transactions create' }"
+        >
+          Create
+        </v-btn>
+      </v-col>
+      <v-col>
+        <date-picker dense label="from" v-model="duration.from" />
+      </v-col>
+      <v-col>
+        <date-picker dense label="to" v-model="duration.to" />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          :filter="defaultFilterObject"
+          label="Types"
+          dense
+          v-model="selectedTypes"
+          multiple
+          :items="types"
+        />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          dense
+          :filter="defaultFilterObject"
+          label="Accounts"
+          item-text="title"
+          item-value="uuid"
+          v-model="selectedAccounts"
+          multiple
+          :items="accounts"
+        />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          :filter="defaultFilterObject"
+          dense
+          label="Instances"
+          item-text="title"
+          item-value="uuid"
+          v-model="selectedInstances"
+          multiple
+          :items="instances"
+        />
+      </v-col>
+    </v-row>
 
     <v-progress-linear indeterminate class="pt-1" v-if="chartLoading" />
     <template v-else-if="series.length < 1">
@@ -51,6 +76,8 @@
       v-if="!isInitLoading"
       table-name="transaction-table"
       :filters="filters"
+      :duration="duration"
+      @input:unique="types = $event.transactionType"
       :select-record="selectTransaction"
     />
   </div>
@@ -64,13 +91,16 @@ import apexcharts from "vue-apexcharts";
 import { defaultFilterObject } from "@/functions";
 import { mapGetters } from "vuex";
 import reportsTable from "@/components/reports_table.vue";
+import DatePicker from "@/components/ui/datePicker.vue";
 export default {
   name: "transactions-view",
-  components: { reportsTable, apexcharts },
+  components: { DatePicker, reportsTable, apexcharts },
   mixins: [snackbar, search],
   data: () => ({
-    accountId: null,
-    serviceId: null,
+    selectedAccounts: [],
+    selectedInstances: [],
+    selectedTypes: [],
+    types: [],
     series: [],
     chartLoading: false,
     isInitLoading: true,
@@ -83,6 +113,7 @@ export default {
       theme: { palette: "palette10", mode: "dark" },
       legend: { showForSingleSeries: true },
     },
+    duration: { to: null, from: null },
   }),
   methods: {
     defaultFilterObject,
@@ -148,9 +179,9 @@ export default {
   },
   created() {
     if (this.$route.query.account) {
-      this.accountId = this.$route.query.account;
+      this.selectedAccounts = [this.$route.query.account];
     } else {
-      this.accountId = null;
+      this.selectedAccounts = [];
     }
     this.isInitLoading = false;
   },
@@ -159,11 +190,6 @@ export default {
     this.$store.dispatch("services/fetch");
     this.$store.dispatch("namespaces/fetch");
     this.$store.dispatch("currencies/fetch");
-
-    this.$store.commit("reloadBtn/setCallback", {
-      type: "transactions/init",
-      params: this.transactionData,
-    });
   },
   computed: {
     ...mapGetters("transactions", ["count", "page", "isLoading", "all"]),
@@ -177,44 +203,51 @@ export default {
       return this.$store.getters["namespaces/all"];
     },
     accounts() {
-      const accounts = this.$store.getters["accounts/all"];
-      return [{ title: "all", uuid: null }].concat(accounts);
+      return this.$store.getters["accounts/all"];
     },
     services() {
       return this.$store.getters["services/all"];
     },
     filters() {
       return {
-        service: this.serviceId ? [this.serviceId] : undefined,
-        account: this.accountId ? [this.accountId] : undefined,
+        account: this.selectedAccounts.length
+          ? this.selectedAccounts
+          : undefined,
+        instance: this.selectedInstances.length
+          ? this.selectedInstances
+          : undefined,
+        transactionType: this.selectedTypes.length
+          ? this.selectedTypes
+          : undefined,
       };
     },
     servicesByAccount() {
-      let filtredServices = null;
-      if (this.accountId) {
-        const namespaceId = this.namespaces.find(
-          (n) => this.accountId === n.access.namespace
-        )?.uuid;
-        filtredServices = this.services.filter((s) => {
-          return s.access.namespace === namespaceId;
+      const namespaces = this.namespaces
+        .filter((n) => this.selectedAccounts.includes(n.access.namespace))
+        .map((n) => n.uuid);
+
+      return this.services.filter((s) => {
+        return namespaces.includes(s.access.namespace);
+      });
+    },
+    instances() {
+      const instances = [];
+      this.servicesByAccount.forEach((s) => {
+        s.instancesGroups.forEach((ig) => {
+          ig.instances.forEach((i) =>
+            instances.push({ title: i.title, uuid: i.uuid })
+          );
         });
-      } else {
-        filtredServices = this.services;
-      }
+      });
 
-      return [{ title: "all", uuid: null }].concat(
-        filtredServices.map((el) => ({
-          title: `${el.title} (${el.uuid.slice(0, 8)})`,
-          uuid: el.uuid,
-        }))
-      );
+      return instances;
     },
     balance() {
       const dates = [];
       let labels = [`0 ${this.defaultCurrency}`];
       let values = [0];
       let balance = 0;
-      if (!this.accountId) {
+      if (!this.selectedAccounts) {
         return { labels, values };
       }
       this.transactions?.forEach((el, i, arr) => {
@@ -237,30 +270,18 @@ export default {
     searchParam() {
       return this.$store.getters["appSearch/param"];
     },
-    transactionData() {
-      const data = {};
-      if (this.accountId || this.accountId === "all") {
-        data.account = this.accountId;
-      }
-      if (this.accountId) {
-        data.service = this.serviceId;
-      }
-      return data;
-    },
   },
   watch: {
     chartLoading() {
       setTimeout(this.setListenerToLegend);
     },
-    user() {
-      this.accountId = this.user.uuid;
-    },
-    accountId() {
-      if (this.serviceId === null) {
-        this.serviceId = null;
-      } else {
-        this.serviceId = null;
-      }
+    selectedAccounts: {
+      handler() {
+        this.selectedInstances = this.selectedInstances.filter((si) =>
+          this.instances.find((i) => i.uuid === si)
+        );
+      },
+      deep: true,
     },
   },
 };
diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 3750eec2f..1fdf45b62 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -9,31 +9,20 @@
               <v-subheader>Type</v-subheader>
             </v-col>
             <v-col cols="9">
-              <v-autocomplete
-                label="Type"
-                v-model="type"
-                item-value="value"
+              <v-select
+                item-value="id"
                 item-text="title"
+                label="Type"
+                v-model="typeId"
                 :items="types"
-              />
-            </v-col>
-          </v-row>
-        </v-col>
-      </v-row>
-      <v-row>
-        <v-col lg="6" cols="12">
-          <v-row align="center">
-            <v-col cols="3">
-              <v-subheader>Amount type</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <v-autocomplete
-                label="Amount type"
-                v-model="amountType"
-                item-value="value"
-                item-text="title"
-                :items="amountTypes"
-              />
+              >
+                <template v-slot:item="{ item }">
+                  <span>{{ item.title }} - {{ item.amount.title }}</span>
+                </template>
+                <template v-slot:selection="{ item }">
+                  <span>{{ item.title }} - {{ item.amount.title }}</span>
+                </template>
+              </v-select>
             </v-col>
           </v-row>
         </v-col>
@@ -57,7 +46,7 @@
             </v-col>
           </v-row>
 
-          <v-row align="center">
+          <v-row align="center" v-if="!isServiceHide">
             <v-col cols="3">
               <v-subheader>Service</v-subheader>
             </v-col>
@@ -67,6 +56,7 @@
                 label="Service"
                 item-value="title"
                 item-text="title"
+                clearable
                 v-model="transaction.service"
                 :items="servicesByAccount"
               />
@@ -157,6 +147,14 @@
             </v-col>
           </v-row>
 
+          <v-row v-if="!isAdminNoteHide" class="mx-5">
+            <v-textarea
+              no-resize
+              label="Admin note"
+              v-model="transaction.meta.note"
+            ></v-textarea>
+          </v-row>
+
           <v-row class="mx-5">
             <v-textarea
               no-resize
@@ -165,32 +163,43 @@
               v-model="transaction.meta.description"
             ></v-textarea>
           </v-row>
-
-          <v-row>
-            <v-col cols="3">
-              <v-subheader>Meta</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <json-editor
-                :json="transaction.meta"
-                @changeValue="(data) => (transaction.meta = data)"
-              />
-            </v-col>
-          </v-row>
+          <v-expansion-panels class="mt-4">
+            <v-expansion-panel>
+              <v-expansion-panel-header color="background-light">
+                <span class="text-h6">Meta</span>
+                <template v-slot:actions>
+                  <v-icon x-large> $expand </v-icon>
+                </template>
+              </v-expansion-panel-header>
+              <v-expansion-panel-content color="background-light">
+                <json-editor
+                  :json="transaction.meta"
+                  @changeValue="(data) => (transaction.meta = data)"
+                />
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-col>
       </v-row>
 
-      <v-row>
-        <v-col>
-          <v-btn
-            class="mr-2"
-            color="background-light"
-            :loading="isLoading"
-            @click="tryToSend"
-          >
-            Create
-          </v-btn>
-        </v-col>
+      <v-row justify="start" class="mb-4">
+        <v-btn
+          class="mx-3"
+          color="background-light"
+          :loading="isLoading"
+          @click="tryToSend(false)"
+        >
+          Publish
+        </v-btn>
+        <v-btn
+          v-if="isPublishWithEmailAvailble"
+          class="mx-4"
+          color="background-light"
+          :loading="isLoading"
+          @click="tryToSend(true)"
+        >
+          Publish + email
+        </v-btn>
       </v-row>
     </v-form>
   </div>
@@ -213,7 +222,7 @@ export default {
       service: "",
       total: "",
       exec: 0,
-      meta: { instances: [], description: "", type: "" },
+      meta: { instances: [], description: "", transactionType: "" },
     },
     date: {
       title: "Date",
@@ -230,15 +239,57 @@ export default {
     isLoading: false,
 
     types: [
-      { value: "invoice", title: "Invoice" },
-      { value: "transaction", title: "Transaction" },
+      {
+        id: 1,
+        value: "invoice",
+        title: "Invoice",
+        amount: { title: "Payment invoice (no balance change)", value: true },
+      },
+      {
+        id: 2,
+        value: "invoice",
+        title: "Invoice",
+        amount: { title: "Top-up invoice (with balance change)", value: false },
+      },
+      {
+        id: 3,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Top-up", value: false },
+      },
+      {
+        id: 4,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Debit", value: true },
+      },
+      {
+        id: 5,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Set account balance", value: null },
+      },
     ],
-    type: "transaction",
-    amountType: true,
+    typeId: 4,
+
+    whmcsApi: "",
   }),
   methods: {
     defaultFilterObject,
-    async tryToSend() {
+    sendTransactionType() {
+      let amount = "";
+
+      if (this.fullType.amount.value === null) {
+        amount = "account-balance";
+      } else {
+        amount = this.fullType.amount.value ? "payment" : "top-up";
+      }
+      this.transaction.meta.transactionType = [
+        this.fullType.value,
+        amount,
+      ].join(" ");
+    },
+    async tryToSend(withEmail = false) {
       if (!this.isValid) {
         this.$refs.form.validate();
 
@@ -253,33 +304,43 @@ export default {
 
       try {
         let total = this.transaction.total;
-        if (this.amountType === null) {
+        const amountType = this.fullType.amount.value;
+        if (amountType === null) {
           const balance = this.transaction.account.balance || 0;
           const difference = Math.abs(total - balance);
           total = (balance > total ? +difference : -difference).toFixed(2);
         } else {
           total = Math.abs(total);
-          total = this.amountType ? total : -total;
-          if (this.isInvoice) {
-            this.transaction.meta.invoiceType = this.amountType
-              ? "top-up"
-              : "payment";
-          }
+          total = amountType ? total : -total;
         }
 
-        await api.transactions.create({
+        const transaction = await api.transactions.create({
           ...this.transaction,
           account: this.transaction.account.uuid,
           total,
           currency: this.transaction.account.currency,
         });
+
+        if (this.transaction.meta.transactionType.startsWith("invoice")) {
+          await fetch(
+            /https:\/\/(.+?\.?\/)/.exec(this.whmcsApi)[0] +
+              `modules/addons/nocloud/api/index.php?run=create_invoice&account=${
+                this.transaction.account.uuid
+              }&total=${this.transaction.total}&type=${
+                this.transaction.meta.transactionType.split(" ")[1]
+              }&description=${
+                this.transaction.meta.description
+              }&send_email=${withEmail}&transaction=${transaction.uuid}`
+          );
+        }
+
         this.showSnackbarSuccess({
           message: "Transaction created successfully",
         });
 
         setTimeout(() => {
           this.$router.push({ name: "Transactions" });
-        }, 1500);
+        }, 500);
       } catch (err) {
         this.showSnackbarError({
           message: err,
@@ -292,12 +353,9 @@ export default {
       this.transaction.service =
         this.services.find(
           (service) => service.title === this.transaction.service
-        )?.uuid || "";
+        )?.uuid || undefined;
 
       this.transaction.exec = this.exec;
-      if (!this.transaction.exec) {
-        this.transaction.priority = "NORMAL";
-      }
       this.transaction.total *= 1;
     },
     resetDate() {
@@ -317,29 +375,34 @@ export default {
       this.time.value = `${time}`;
     },
   },
-  created() {
+  async created() {
     this.initDate();
-    this.transaction.meta.type = this.type;
+    this.sendTransactionType();
 
     if (this.accounts.length < 2) {
       this.$store.dispatch("accounts/fetch");
     }
 
-    this.$store.dispatch("namespaces/fetch");
-    this.$store
-      .dispatch("services/fetch")
+    await Promise.all([
+      this.$store.dispatch("settings/fetch"),
+      this.$store.dispatch("namespaces/fetch"),
+      this.$store.dispatch("services/fetch"),
+    ])
       .then(() => {
         this.fetchError = "";
+        this.whmcsApi = JSON.parse(
+          this.settings.find(({ key }) => key === "whmcs").value
+        ).api;
       })
       .catch((err) => {
-        console.error(err);
-
-        this.fetchError = "Can't reach the server";
+        let fetchError = "Can't reach the server";
         if (err.response) {
-          this.fetchError += `: [ERROR]: ${err.response.data.message}`;
+          fetchError += `: [ERROR]: ${err.response.data.message}`;
         } else {
-          this.fetchError += `: [ERROR]: ${err.toJSON().message}`;
+          fetchError += `: [ERROR]: ${err.toJSON().message}`;
         }
+
+        this.showSnackbarError({ message: fetchError });
       });
   },
   computed: {
@@ -352,6 +415,9 @@ export default {
     services() {
       return this.$store.getters["services/all"];
     },
+    settings() {
+      return this.$store.getters["settings/all"];
+    },
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
@@ -392,43 +458,42 @@ export default {
       return new Date(`${this.date.value}T${this.time.value}`).getTime() / 1000;
     },
     isTransaction() {
-      return this.type === "transaction";
+      return this.fullType.value === "transaction";
     },
     isInvoice() {
-      return this.type === "invoice";
+      return this.fullType.value === "invoice";
     },
     amountRule() {
       return [
         (v) =>
-          (this.amountType === null ? v === 0 || !!v : !!v) ||
+          (this.fullType.amount.value === null ? v === 0 || !!v : !!v) ||
           "This field is required!",
       ];
     },
-    amountTypes() {
-      if (this.isTransaction) {
-        return [
-          { title: "Top-up", value: false },
-          { title: "Debit", value: true },
-          { title: "Account balance", value: null },
-        ];
-      }
-
-      return [
-        { title: "Top-up invoice (with balance change)", value: true },
-        { title: "Payment invoice (no balance change)", value: false },
-      ];
+    fullType() {
+      return this.types.find((t) => t.id === this.typeId);
+    },
+    isServiceHide() {
+      return this.isInvoice;
+    },
+    isAdminNoteHide() {
+      return this.isTransaction;
+    },
+    isPublishWithEmailAvailble() {
+      return this.isInvoice;
     },
   },
   watch: {
     "transaction.service"() {
       this.transaction.meta.instances = [];
     },
-    type() {
-      this.transaction.meta.type = this.type;
+    typeId() {
+      this.sendTransactionType();
       if (this.isInvoice) {
-        this.amountType = false;
+        this.transaction.service = undefined;
         this.resetDate();
       } else if (this.isTransaction) {
+        this.transaction.meta.note = undefined;
         this.initDate();
       }
     },
diff --git a/cmd/oauth2/main.go b/cmd/oauth2/main.go
index 66e8bf41a..2893176ef 100644
--- a/cmd/oauth2/main.go
+++ b/cmd/oauth2/main.go
@@ -62,7 +62,7 @@ func main() {
 
 	registryClient := registry.NewAccountsServiceClient(registryConn)
 
-	server := oauth2.NewOAuth2Server(log, registryHost)
+	server := oauth2.NewOAuth2Server(log, SIGNING_KEY)
 	server.SetupRegistryClient(registryClient)
 	server.Start(port, corsAllowed)
 }
diff --git a/go.mod b/go.mod
index d5cd16edf..8291e361b 100644
--- a/go.mod
+++ b/go.mod
@@ -12,29 +12,33 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
-	github.com/rabbitmq/amqp091-go v1.8.1
-	github.com/rs/cors v1.10.0
-	github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685
-	github.com/spf13/viper v1.16.0
+	github.com/rabbitmq/amqp091-go v1.9.0
+	github.com/rs/cors v1.10.1
+	github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc
+	github.com/spf13/viper v1.17.0
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
 	github.com/wI2L/jsondiff v0.4.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.13.0
-	golang.org/x/oauth2 v0.12.0
-	google.golang.org/grpc v1.58.1
+	golang.org/x/crypto v0.14.0
+	golang.org/x/oauth2 v0.13.0
+	google.golang.org/grpc v1.58.2
 	google.golang.org/protobuf v1.31.0
 )
 
 require (
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.16.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
 )
 
 require (
@@ -49,13 +53,12 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index faaa54ac1..42cb66fe2 100644
--- a/go.sum
+++ b/go.sum
@@ -62,8 +62,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
 github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
 github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -189,31 +189,35 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
-github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
+github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
+github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8=
-github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685 h1:z55krMEmUcSgmnb3szZBhuqGdxEwcuLa0BcUotG/AO0=
-github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685/go.mod h1:HY6zAuqFtnMRWY2uSvpvyBioOOk3iGl0qUdAxOhja0k=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc h1:wGiOebdVhsFpv1hPDJTMn8yq8//qewSsEFP8IkX3SyY=
+github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc/go.mod h1:4Hsf0e2WQQOWaZj6sC1vVq4oCdu30asV+JzWk/xAlIg=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
 github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
-github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
 github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
 github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -263,8 +267,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -275,6 +279,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -331,8 +337,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -342,8 +348,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -395,8 +401,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -529,12 +535,12 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA=
+google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI=
+google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -551,8 +557,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58=
-google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/pkg/billing/records.go b/pkg/billing/records.go
index 38083a715..0a96714ef 100644
--- a/pkg/billing/records.go
+++ b/pkg/billing/records.go
@@ -17,6 +17,7 @@ package billing
 
 import (
 	"context"
+	"google.golang.org/protobuf/types/known/structpb"
 	"time"
 
 	"github.com/arangodb/go-driver"
@@ -468,5 +469,22 @@ func (s *BillingServiceServer) GetRecordsReportsCount(ctx context.Context, req *
 	if err != nil {
 		return nil, err
 	}
-	return &pb.GetReportsCountResponse{Total: res}, nil
+
+	types, err := s.records.GetUnique(ctx)
+
+	if err != nil {
+		return nil, err
+	}
+
+	s.log.Debug("Types", zap.Any("types", types))
+
+	value, err := structpb.NewValue(types)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.GetReportsCountResponse{
+		Total:  res,
+		Unique: value,
+	}, nil
 }
diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index da0dae97a..cd449fe4a 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -179,9 +179,35 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 	if t.Meta == nil {
 		t.Meta = map[string]*structpb.Value{}
 		t.Meta["type"] = structpb.NewStringValue("transaction")
+	}
+
+	meta := map[string]*structpb.Value{}
+
+	trType, ok := t.Meta["transactionType"]
+
+	if ok {
+		meta["transactionType"] = trType
+	}
 
+	rec := s.records.Create(ctx, &pb.Record{
+		Start:     time.Now().Unix(),
+		End:       time.Now().Unix() + 1,
+		Exec:      time.Now().Unix(),
+		Processed: true,
+		Priority:  t.GetPriority(),
+		Total:     t.GetTotal(),
+		Currency:  t.GetCurrency(),
+		Service:   t.GetService(),
+		Account:   t.GetAccount(),
+		Meta:      meta,
+	})
+
+	if t.GetRecords() == nil {
+		t.Records = []string{}
 	}
 
+	t.Records = append(t.Records, rec.Key())
+
 	r, err := s.transactions.Create(ctx, t)
 	if err != nil {
 		log.Error("Failed to create transaction", zap.Error(err))
@@ -194,7 +220,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		Key:  "transaction_created",
 	})
 
-	if r.Transaction.Priority == pb.Priority_URGENT {
+	if r.Transaction.Priority == pb.Priority_URGENT && r.Transaction.GetExec() != 0 {
 		acc := driver.NewDocumentID(schema.ACCOUNTS_COL, r.Transaction.Account)
 		transaction := driver.NewDocumentID(schema.TRANSACTIONS_COL, r.Transaction.Uuid)
 		currencyConf := MakeCurrencyConf(ctx, log)
@@ -203,6 +229,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		_, err := s.db.Query(ctx, processUrgentTransaction, map[string]interface{}{
 			"@accounts":      schema.ACCOUNTS_COL,
 			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
 			"accountKey":     acc.String(),
 			"transactionKey": transaction.String(),
 			"currency":       currencyConf.Currency,
@@ -275,6 +302,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 
 		_, err := s.db.Query(ctx, updateTransactionWithCurrency, map[string]interface{}{
 			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
 			"accountKey":     acc.String(),
 			"transactionKey": transaction.String(),
 			"currency":       currencyConf.Currency,
@@ -396,6 +424,83 @@ func (s *BillingServiceServer) UpdateTransaction(ctx context.Context, req *pb.Tr
 		log.Error("Failed to update transaction", zap.Error(err))
 		return nil, status.Error(codes.Internal, "Failed to update transaction")
 	}
+
+	if t.GetPriority() == pb.Priority_URGENT {
+		acc := driver.NewDocumentID(schema.ACCOUNTS_COL, t.Account)
+		transaction := driver.NewDocumentID(schema.TRANSACTIONS_COL, t.Uuid)
+		currencyConf := MakeCurrencyConf(ctx, log)
+		suspConf := MakeSuspendConf(ctx, log)
+
+		_, err := s.db.Query(ctx, processUrgentTransaction, map[string]interface{}{
+			"@accounts":      schema.ACCOUNTS_COL,
+			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
+			"accountKey":     acc.String(),
+			"transactionKey": transaction.String(),
+			"currency":       currencyConf.Currency,
+			"currencies":     schema.CUR_COL,
+			"now":            time.Now().Unix(),
+			"graph":          schema.BILLING_GRAPH.Name,
+		})
+		if err != nil {
+			log.Error("Failed to process transaction", zap.String("err", err.Error()))
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+
+		dbAcc, err := accClient.Get(ctx, &accounts.GetRequest{Uuid: t.Account, Public: false})
+
+		if err != nil {
+			log.Error("Failed to get account", zap.String("err", err.Error()))
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+
+		var cur pb.Currency
+
+		if dbAcc.Currency == nil {
+			cur = pb.Currency_NCU
+		} else {
+			cur = *dbAcc.Currency
+		}
+
+		var rate float64 = 1
+
+		if cur != pb.Currency(currencyConf.Currency) {
+			rate, err = s.currencies.GetExchangeRate(ctx, cur, pb.Currency(currencyConf.Currency))
+
+			if err != nil {
+				log.Error("Failed to get exchange rate", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		}
+
+		var balance = 0.0
+		if dbAcc.Balance != nil {
+			balance = *dbAcc.Balance
+		}
+
+		balance = balance * rate
+
+		var isSuspended = false
+
+		if dbAcc.Suspended != nil {
+			isSuspended = *dbAcc.Suspended
+		}
+
+		if !isSuspended && balance < suspConf.Limit {
+			_, err := accClient.Suspend(ctx, &accounts.SuspendRequest{Uuid: t.Account})
+			if err != nil {
+				log.Error("Failed to suspend account", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		} else if isSuspended && balance > suspConf.Limit {
+			_, err := accClient.Unsuspend(ctx, &accounts.UnsuspendRequest{Uuid: t.Account})
+			if err != nil {
+				log.Error("Failed to unsuspend account", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		}
+	}
+
 	return &pb.UpdateTransactionResponse{Result: true}, nil
 }
 
@@ -415,6 +520,9 @@ LET rate = PRODUCT(
 
 LET total = transaction.total * rate
 
+FOR r in transaction.records
+	UPDATE r WITH {total: total} in @@records
+
 UPDATE transaction WITH {processed: true, proc: @now, currency: currency, total: total} IN @@transactions
 UPDATE account WITH { balance: account.balance - total } IN @@accounts
 
@@ -437,6 +545,9 @@ LET rate = PRODUCT(
 
 LET total = transaction.total * rate
 
+FOR r in transaction.records
+	UPDATE r WITH {total: total} in @@records
+
 UPDATE transaction WITH {currency: currency, total: total} IN @@transactions
 RETURN transaction
 `
diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 6d14af36f..0558c0a9a 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -40,15 +40,46 @@ LET account = LAST(
     FILTER IS_SAME_COLLECTION(node, @@accounts)
         RETURN node
     )
-    
-RETURN {account: account._key, service: srv.title, instance: doc.title, product: doc.product}
+
+LET rate_one = LAST(
+	FOR i IN @@c2c
+    FILTER (i.to == 0 || i.from == 0) && i.rate == 1
+        RETURN i
+)
+
+LET default_cur = rate_one.to == 0 ? rate_one.from : rate_one.to
+
+LET currency = account.currency != null ? account.currency : default_cur
+LET rate = PRODUCT(
+	FOR vertex, edge IN OUTBOUND
+	SHORTEST_PATH DOCUMENT(CONCAT(@currencies, "/", default_cur))
+	TO DOCUMENT(CONCAT(@currencies, "/", currency))
+	GRAPH @graph
+	FILTER edge
+		RETURN edge.rate
+)
+
+LET price = doc.billing_plan.products[doc.product] == null ? 0 : doc.billing_plan.products[doc.product].price
+
+RETURN {
+	account: account._key, 
+	service: srv.title, 
+	instance: doc.title, 
+	product: doc.product, 
+	next_payment_date: doc.data.next_payment_date,
+	ip: doc.state.meta.networking.public[0],
+	price: price * rate
+}
 `
 
 type EventInfo struct {
-	Account  string `json:"account"`
-	Service  string `json:"service"`
-	Instance string `json:"instance"`
-	Product  string `json:"product,omitempty"`
+	Account         string  `json:"account"`
+	Service         string  `json:"service"`
+	Instance        string  `json:"instance"`
+	Product         string  `json:"product,omitempty"`
+	Ip              string  `json:"ip,omitempty"`
+	NextPaymentDate float64 `json:"next_payment_date,omitempty"`
+	Price           float64 `json:"price,omitempty"`
 }
 
 func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Database) (*pb.Event, error) {
@@ -63,6 +94,9 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 		"permissions": schema.PERMISSIONS_GRAPH.Name,
 		"@services":   schema.SERVICES_COL,
 		"@accounts":   schema.ACCOUNTS_COL,
+		"currencies":  schema.CUR_COL,
+		"graph":       schema.BILLING_GRAPH.Name,
+		"@c2c":        schema.CUR2CUR,
 	})
 	if err != nil {
 		return nil, err
@@ -83,7 +117,14 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 	if eventInfo.Product != "" {
 		event.Data["product"] = structpb.NewStringValue(eventInfo.Product)
 	}
+	if eventInfo.Ip != "" {
+		event.Data["ip"] = structpb.NewStringValue(eventInfo.Ip)
+	}
+	if eventInfo.NextPaymentDate != 0 {
+		event.Data["next_payment_date"] = structpb.NewNumberValue(eventInfo.NextPaymentDate)
+	}
 	event.Data["instance_uuid"] = structpb.NewStringValue(event.GetUuid())
+	event.Data["price"] = structpb.NewNumberValue(eventInfo.Price)
 	event.Uuid = eventInfo.Account
 	event.Type = "email"
 
diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 13f245fc0..6121b387f 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -17,6 +17,7 @@ package graph
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"github.com/arangodb/go-driver"
 	pb "github.com/slntopp/nocloud-proto/billing"
@@ -215,7 +216,11 @@ func (ctrl *RecordsController) GetRecordsReports(ctx context.Context, req *pb.Ge
 			if len(values) == 0 {
 				continue
 			}
-			query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			if key == "transactionType" {
+				query += fmt.Sprintf(` FILTER record.meta["%s"] in @%s`, key, key)
+			} else {
+				query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			}
 			params[key] = values
 		}
 	}
@@ -308,7 +313,11 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 			if len(values) == 0 {
 				continue
 			}
-			query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			if key == "transactionType" {
+				query += fmt.Sprintf(` FILTER record.meta["%s"] in @%s`, key, key)
+			} else {
+				query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			}
 			params[key] = values
 		}
 	}
@@ -329,3 +338,50 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 
 	return result, nil
 }
+
+const uniqueQuery = `
+LET records = (
+	FOR r in @@records
+	FILTER r.meta != null
+	FILTER r.meta.transactionType != null
+	FILTER r.meta.transactionType != ""
+	RETURN r
+)
+
+RETURN UNIQUE(records[*].meta.transactionType)
+`
+
+func (ctrl *RecordsController) GetUnique(ctx context.Context) (map[string]interface{}, error) {
+
+	cur, err := ctrl.db.Query(ctx, uniqueQuery, map[string]interface{}{
+		"@records": schema.RECORDS_COL,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var types []string
+
+	_, err = cur.ReadDocument(ctx, &types)
+	if err != nil {
+		return nil, err
+	}
+
+	marshal, err := json.Marshal(types)
+	if err != nil {
+		return nil, err
+	}
+
+	var iTypes []interface{}
+
+	err = json.Unmarshal(marshal, &iTypes)
+	if err != nil {
+		return nil, err
+	}
+
+	var result = map[string]interface{}{
+		"transactionType": iTypes,
+	}
+
+	return result, nil
+}
diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 726f4f14d..ea1412b63 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -4,23 +4,35 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/golang-jwt/jwt/v4"
 	"github.com/gorilla/mux"
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
+	"github.com/slntopp/nocloud/pkg/nocloud"
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
 	"go.uber.org/zap"
 	"golang.org/x/oauth2"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/structpb"
 	"io"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 )
 
+type StateInfo struct {
+	RedirectUrl string
+	Token       string
+	Method      string
+}
+
 type BitrixOauthHandler struct {
-	states map[string]string
+	states map[string]*StateInfo
 	m      *sync.Mutex
 }
 
@@ -28,8 +40,14 @@ type UserInfo struct {
 	Result map[string]interface{} `json:"result"`
 }
 
-func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
-	g.states = map[string]string{}
+func (g *BitrixOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
+	g.states = map[string]*StateInfo{}
 	g.m = &sync.Mutex{}
 
 	oauth2Config := &oauth2.Config{
@@ -49,7 +67,45 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		state, redirect := r.FormValue("state"), r.FormValue("redirect")
 
 		g.m.Lock()
-		g.states[state] = redirect
+		g.states[state] = &StateInfo{
+			RedirectUrl: redirect,
+			Method:      "sign_in",
+		}
+		log.Debug("Put state", zap.Any("state", g.states[state]))
+		g.m.Unlock()
+
+		url := oauth2Config.AuthCodeURL(state)
+
+		result := map[string]string{
+			"url": url,
+		}
+
+		marshal, _ := json.Marshal(result)
+		w.Write(marshal)
+	}))
+	router.Handle("/oauth/bitrix/link", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, redirect := r.FormValue("state"), r.FormValue("redirect")
+
+		authHeader := r.Header.Get("Authorization")
+		authHeaderSplit := strings.Split(authHeader, " ")
+
+		if len(authHeaderSplit) != 2 {
+			log.Error("Len is not 2")
+			return
+		}
+
+		if strings.ToLower(authHeaderSplit[0]) != "bearer" {
+			log.Error("No bearer")
+			return
+		}
+
+		g.m.Lock()
+		g.states[state] = &StateInfo{
+			RedirectUrl: redirect,
+			Token:       authHeaderSplit[1],
+			Method:      "link",
+		}
+		log.Debug("Put state", zap.Any("state", g.states[state]))
 		g.m.Unlock()
 
 		url := oauth2Config.AuthCodeURL(state)
@@ -63,7 +119,6 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 	}))
 	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, code := r.FormValue("state"), r.FormValue("code")
-		var redirect string
 
 		g.m.Lock()
 
@@ -72,7 +127,9 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		redirect = g.states[state]
+		stateInfo := g.states[state]
+
+		log.Debug("Get state", zap.Any("state", stateInfo))
 		delete(g.states, state)
 		g.m.Unlock()
 
@@ -105,14 +162,18 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		}
 
 		if userInfo.Result == nil {
+			log.Error("No user info")
 			return
 		}
 
 		user := userInfo.Result
 		value := user[field].(string)
 
+		log.Debug("User", zap.Any("user", user))
+
 		name := user["NAME"].(string)
 		last_name := user["LAST_NAME"].(string)
+		id := user["ID"].(string)
 
 		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
 		if err != nil {
@@ -122,20 +183,29 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 
 		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+rootToken)
 
-		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
-			Auth: &accounts.Credentials{
-				Type: "oauth2-bitrix",
-				Data: []string{
-					field,
-					value,
-				},
-			},
-			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
-		})
-		if err != nil {
-			_, err = regClient.Create(ctx, &accounts.CreateRequest{
-				Title:     fmt.Sprintf("%s %s", name, last_name),
-				Namespace: schema.ROOT_NAMESPACE_KEY,
+		if stateInfo.Method == "link" {
+			ncToken, err := jwt.Parse(stateInfo.Token, func(t *jwt.Token) (interface{}, error) {
+				if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+					return nil, status.Errorf(codes.Unauthenticated, "Unexpected signing method: %v", t.Header["alg"])
+				}
+				return signingKey, nil
+			})
+
+			if err != nil {
+				log.Error("Failed to get token", zap.Error(err))
+				return
+			}
+
+			if !ncToken.Valid {
+				log.Error("Token invalid", zap.Error(err))
+				return
+			}
+
+			claims := ncToken.Claims.(jwt.MapClaims)
+			acc := claims[nocloud.NOCLOUD_ACCOUNT_CLAIM].(string)
+
+			resp, err := regClient.SetCredentials(ctx, &accounts.SetCredentialsRequest{
+				Account: acc,
 				Auth: &accounts.Credentials{
 					Type: "oauth2-bitrix",
 					Data: []string{
@@ -144,11 +214,58 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 					},
 				},
 			})
+
+			if err != nil {
+				log.Error("Failed set creds", zap.Error(err))
+				return
+			}
+
+			if !resp.GetResult() {
+				log.Error("False result")
+				return
+			}
+
+			get, err := regClient.Get(ctx, &accounts.GetRequest{
+				Uuid: acc,
+			})
+
+			if err != nil {
+				log.Error("Failed get acc", zap.Error(err))
+				return
+			}
+
+			if get.GetData() == nil {
+				get.Data = &structpb.Struct{
+					Fields: make(map[string]*structpb.Value),
+				}
+			}
+
+			if get.GetData().GetFields() == nil {
+				get.Data.Fields = map[string]*structpb.Value{}
+			}
+
+			_, ok := get.GetData().GetFields()["oauth_types"]
+
+			if !ok {
+				list, _ := structpb.NewList([]interface{}{
+					"oauth2-bitrix",
+				})
+				get.Data.Fields["oauth_types"] = structpb.NewListValue(list)
+			} else {
+				get.Data.GetFields()["oauth_types"].GetListValue().Values = append(get.Data.GetFields()["oauth_types"].GetListValue().GetValues(), structpb.NewStringValue("oauth2-bitrix"))
+			}
+
+			get.Data.Fields["bitrix24"] = structpb.NewStringValue(id)
+
+			_, err = regClient.Update(ctx, get)
 			if err != nil {
-				log.Error("Failed create account", zap.Error(err))
+				log.Error("Failed to update")
 				return
 			}
-			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
+
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", stateInfo.RedirectUrl, stateInfo.Token), http.StatusSeeOther)
+		} else {
+			resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
 					Type: "oauth2-bitrix",
 					Data: []string{
@@ -159,12 +276,49 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				log.Error("Failed get token", zap.Error(err))
-				return
+				list, _ := structpb.NewList([]interface{}{
+					"oauth2-bitrix",
+				})
+				listValue := structpb.NewListValue(list)
+
+				data := &structpb.Struct{
+					Fields: map[string]*structpb.Value{
+						"oauth_types": listValue,
+						"bitrix24":    structpb.NewStringValue(id),
+					},
+				}
+				_, err := regClient.Create(ctx, &accounts.CreateRequest{
+					Title:     fmt.Sprintf("%s %s", name, last_name),
+					Namespace: schema.ROOT_NAMESPACE_KEY,
+					Data:      data,
+					Auth: &accounts.Credentials{
+						Type: "oauth2-bitrix",
+						Data: []string{
+							field,
+							value,
+						},
+					},
+				})
+				if err != nil {
+					log.Error("Failed create account", zap.Error(err))
+					return
+				}
+				resp, err = regClient.Token(ctx, &accounts.TokenRequest{
+					Auth: &accounts.Credentials{
+						Type: "oauth2-bitrix",
+						Data: []string{
+							field,
+							value,
+						},
+					},
+					Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+				})
+				if err != nil {
+					log.Error("Failed get token", zap.Error(err))
+					return
+				}
 			}
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", stateInfo.RedirectUrl, resp.GetToken()), http.StatusSeeOther)
 		}
-
-		http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
-
 	}))
 }
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index f3195a87d..8ddb90082 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -25,7 +25,13 @@ type GithubOauthHandler struct {
 	m      *sync.Mutex
 }
 
-func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *GithubOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
 	g.states = map[string]string{}
 	g.m = &sync.Mutex{}
 
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 57ef887ac..4c0750096 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -25,8 +25,13 @@ type GoogleOauthHandler struct {
 	m      *sync.Mutex
 }
 
-func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
-
+func (g *GoogleOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
 	g.states = map[string]string{}
 	g.m = &sync.Mutex{}
 
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index f7b2867b8..0e0e084ab 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -8,7 +8,7 @@ import (
 )
 
 type OAuthHandler interface {
-	Setup(*zap.Logger, *mux.Router, config.OAuth2Config, registry.AccountsServiceClient)
+	Setup(*zap.Logger, *mux.Router, config.OAuth2Config, registry.AccountsServiceClient, []byte)
 }
 
 func GetOAuthHandler(handlerType string) OAuthHandler {
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index e468b0326..4faf29536 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -15,15 +15,17 @@ import (
 type OAuth2Server struct {
 	router         *mux.Router
 	registryClient registry.AccountsServiceClient
+	signingKey     []byte
 
 	log *zap.Logger
 }
 
-func NewOAuth2Server(log *zap.Logger, host string) *OAuth2Server {
+func NewOAuth2Server(log *zap.Logger, signingKey []byte) *OAuth2Server {
 	log.Debug("New Server")
 	return &OAuth2Server{
-		log:    log.Named("OauthServer"),
-		router: mux.NewRouter(),
+		log:        log.Named("OauthServer"),
+		router:     mux.NewRouter(),
+		signingKey: signingKey,
 	}
 }
 
@@ -46,7 +48,7 @@ func (s *OAuth2Server) registerOAuthHandlers() {
 			continue
 		}
 
-		handler.Setup(s.log.Named(key), s.router, conf, s.registryClient)
+		handler.Setup(s.log.Named(key), s.router, conf, s.registryClient, s.signingKey)
 	}
 
 }
diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
index a4e7367bc..a363a4d0b 100644
--- a/pkg/registry/accounts.go
+++ b/pkg/registry/accounts.go
@@ -503,6 +503,11 @@ func (s *AccountsServiceServer) Update(ctx context.Context, request *accountspb.
 		patch["title"] = request.Title
 	}
 
+	if acc.Currency != request.Currency {
+		log.Debug("Title patch detected")
+		patch["currency"] = request.Currency
+	}
+
 	if request.Data == nil {
 		log.Debug("Data patch is not present, skipping")
 		goto patch