diff --git a/Website/ui/babel.config.js b/Website/ui/babel.config.js
index e9558405f..c94e72931 100644
--- a/Website/ui/babel.config.js
+++ b/Website/ui/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
+    presets: [
+        '@vue/cli-plugin-babel/preset'
+    ]
 }
diff --git a/Website/ui/src/classes/paginator.js b/Website/ui/src/classes/paginator.js
index 3b026d60e..d9663dd27 100644
--- a/Website/ui/src/classes/paginator.js
+++ b/Website/ui/src/classes/paginator.js
@@ -42,8 +42,8 @@ export class Paginator {
         param['page'] = page
         param['per_page'] = this.perPage
         return axios.get(this.url, {
-                params: param
-            }
+            params: param
+        }
         ).then(response => {
             let data = response.data
             this.from = data.from
diff --git a/Website/ui/src/layouts/MobileTopNavbar.vue b/Website/ui/src/layouts/MobileTopNavbar.vue
index 03802fdd7..4afe0126e 100644
--- a/Website/ui/src/layouts/MobileTopNavbar.vue
+++ b/Website/ui/src/layouts/MobileTopNavbar.vue
@@ -104,44 +104,44 @@
 import Breadcrumb from '../shared/Breadcrumb'
 
 export default {
-  name: 'MobileTopNavBar',
-  components: {Breadcrumb},
-  data() {
-    return {
-      open: false,
-      mobileSidebarVisible: false
-    }
-  },
-  watch: {
-    $route() {
-      this.hideSidebar()
-    }
-  },
-  methods: {
-    logout() {
-      this.$store.dispatch('auth/logOut').then(() => {
-        this.$router.replace('/login')
-      })
-
-    },
-    showSidebar() {
-      this.mobileSidebarVisible = true
-      this.$sidebar.displaySidebar(true)
+    name: 'MobileTopNavBar',
+    components: {Breadcrumb},
+    data() {
+        return {
+            open: false,
+            mobileSidebarVisible: false
+        }
     },
-    hideSidebar() {
-      this.mobileSidebarVisible = false
-      this.$sidebar.displaySidebar(false)
+    watch: {
+        $route() {
+            this.hideSidebar()
+        }
     },
-    replaceRoute(route) {
-      this.$router.replace(route)
-    }
+    methods: {
+        logout() {
+            this.$store.dispatch('auth/logOut').then(() => {
+                this.$router.replace('/login')
+            })
+
+        },
+        showSidebar() {
+            this.mobileSidebarVisible = true
+            this.$sidebar.displaySidebar(true)
+        },
+        hideSidebar() {
+            this.mobileSidebarVisible = false
+            this.$sidebar.displaySidebar(false)
+        },
+        replaceRoute(route) {
+            this.$router.replace(route)
+        }
 
-  },
-  computed: {
-    adminName() {
-      return this.$store.getters['auth/getAuthenticateUser'].name
     },
-  }
+    computed: {
+        adminName() {
+            return this.$store.getters['auth/getAuthenticateUser'].name
+        },
+    }
 }
 </script>
 
diff --git a/Website/ui/src/mixins/mapSharing.js b/Website/ui/src/mixins/mapSharing.js
index e6e4dc7de..fdbfc97e7 100644
--- a/Website/ui/src/mixins/mapSharing.js
+++ b/Website/ui/src/mixins/mapSharing.js
@@ -170,7 +170,7 @@ export const sharedMap = {
                 if (layer._icon) {
                     layer.remove()
                 }
-            });
+            })
         },
     },
     computed: {
diff --git a/Website/ui/src/modules/Assets/AddAsset.vue b/Website/ui/src/modules/Assets/AddAsset.vue
index a383fb911..d87b48e67 100644
--- a/Website/ui/src/modules/Assets/AddAsset.vue
+++ b/Website/ui/src/modules/Assets/AddAsset.vue
@@ -105,7 +105,7 @@ export default {
             }
             try {
                 this.loading = true
-               const appliances =  await this.applianceService.createAppliance()
+                const appliances =  await this.applianceService.createAppliance()
 
                 this.loading = false
                 this.alertNotify('success', this.$tc('phrases.newAppliance', 1))
diff --git a/Website/ui/src/modules/Client/Appliances/SellApplianceModal.vue b/Website/ui/src/modules/Client/Appliances/SellApplianceModal.vue
index faa22f4e4..162f1840a 100644
--- a/Website/ui/src/modules/Client/Appliances/SellApplianceModal.vue
+++ b/Website/ui/src/modules/Client/Appliances/SellApplianceModal.vue
@@ -444,14 +444,13 @@ export default {
             if (this.isDeviceBindingRequired(appliance)) {
                 this.isDeviceSelectionRequired = true
                 this.deviceSelectionList = availableDevices.filter((device) => {
-                    debugger
                     switch (appliance.assetTypeId) {
-                        case APPLIANCE_TYPE_SHS_ID:
-                            return (device.deviceType === 'solar_home_system' && device.device.assetId === this.selectedApplianceId)
-                        case APPLIANCE_TYPE_E_BIKE_ID:
-                            return (device.deviceType === 'e_bike' && device.device.assetId === this.selectedApplianceId)
-                        default:
-                            return false
+                    case APPLIANCE_TYPE_SHS_ID:
+                        return (device.deviceType === 'solar_home_system' && device.device.assetId === this.selectedApplianceId)
+                    case APPLIANCE_TYPE_E_BIKE_ID:
+                        return (device.deviceType === 'e_bike' && device.device.assetId === this.selectedApplianceId)
+                    default:
+                        return false
                     }
                 }).map(device => {
                     return {
diff --git a/Website/ui/src/modules/Client/Client.vue b/Website/ui/src/modules/Client/Client.vue
index 03b42eba4..955a01e5b 100644
--- a/Website/ui/src/modules/Client/Client.vue
+++ b/Website/ui/src/modules/Client/Client.vue
@@ -140,14 +140,14 @@ export default {
                 const lon = parseFloat(points[1])
                 let markerType = ''
                 switch (device.device_type) {
-                    case 'e_bike':
-                        markerType = MARKER_TYPE.E_BIKE
-                        break
-                    case 'shs':
-                        markerType = MARKER_TYPE.SHS
-                        break
-                    default:
-                        markerType = MARKER_TYPE.METER
+                case 'e_bike':
+                    markerType = MARKER_TYPE.E_BIKE
+                    break
+                case 'shs':
+                    markerType = MARKER_TYPE.SHS
+                    break
+                default:
+                    markerType = MARKER_TYPE.METER
                 }
                 markingInfos.push({
                     id: device.id,
diff --git a/Website/ui/src/modules/Client/Clients.vue b/Website/ui/src/modules/Client/Clients.vue
index adb65dfd9..0b63f4f5d 100644
--- a/Website/ui/src/modules/Client/Clients.vue
+++ b/Website/ui/src/modules/Client/Clients.vue
@@ -68,7 +68,7 @@ import {People} from '@/classes/people'
 import {timing} from '@/mixins/timing'
 import i18n from '../../i18n'
 import AddClientModal from '@/modules/Client/AddClientModal.vue'
-import {OutstandingDebtsExportService} from "@/services/OutstandingDebtsExportService";
+import {OutstandingDebtsExportService} from '@/services/OutstandingDebtsExportService'
 
 const debounce = require('debounce')
 
@@ -176,7 +176,7 @@ export default {
             this.searchTerm = ''
         },
         exportDebts () {
-            const email = this.$store.getters['auth/getAuthenticateUser'].email;
+            const email = this.$store.getters['auth/getAuthenticateUser'].email
             window.open(this.outstandingDebtsExportService.exportOutstandingDebts(email))
         }
     }
diff --git a/Website/ui/src/modules/Client/PaymentDetail.vue b/Website/ui/src/modules/Client/PaymentDetail.vue
index 9d878cb71..c62c7dbed 100644
--- a/Website/ui/src/modules/Client/PaymentDetail.vue
+++ b/Website/ui/src/modules/Client/PaymentDetail.vue
@@ -71,18 +71,18 @@ export default {
 
         async getFlow (period = 'M') {
             switch (period) {
-                case 'Y':
-                    this.periodName = this.$tc('words.annually')
-                    break
-                case 'M':
-                    this.periodName = this.$tc('words.month', 2)
-                    break
-                case 'W':
-                    this.periodName = this.$tc('words.week', 2)
-                    break
-                case 'D':
-                    this.periodName = this.$tc('words.day', 2)
-                    break
+            case 'Y':
+                this.periodName = this.$tc('words.annually')
+                break
+            case 'M':
+                this.periodName = this.$tc('words.month', 2)
+                break
+            case 'W':
+                this.periodName = this.$tc('words.week', 2)
+                break
+            case 'D':
+                this.periodName = this.$tc('words.day', 2)
+                break
             }
             try {
                 await this.paymentService.getPaymentDetail(this.personId, period)
diff --git a/Website/ui/src/modules/Cluster/AddCluster.vue b/Website/ui/src/modules/Cluster/AddCluster.vue
index aeee1a6f0..7b35e7c03 100644
--- a/Website/ui/src/modules/Cluster/AddCluster.vue
+++ b/Website/ui/src/modules/Cluster/AddCluster.vue
@@ -235,7 +235,6 @@ export default {
             editedItems.forEach((item) => {
                 const editedGeoDataItem = this.mappingService.searchedOrDrawnItems.find(x => x.type === item.type)
                 if (editedGeoDataItem) {
-                    debugger
                     editedGeoDataItem.geojson.coordinates = item.geojson.coordinates
                     editedGeoDataItem.lat = item.lat
                     editedGeoDataItem.lon = item.lon
diff --git a/Website/ui/src/modules/EBikes/AddEBikeModal.vue b/Website/ui/src/modules/EBikes/AddEBikeModal.vue
index 0dfbe9d7f..afa153e30 100644
--- a/Website/ui/src/modules/EBikes/AddEBikeModal.vue
+++ b/Website/ui/src/modules/EBikes/AddEBikeModal.vue
@@ -77,7 +77,7 @@ import Widget from '@/shared/widget.vue'
 import {ManufacturerService} from '@/services/ManufacturerService'
 import {ApplianceService} from '@/services/ApplianceService'
 import {timing, notify} from '@/mixins'
-import {EBikeService} from "@/services/EBikeService";
+import {EBikeService} from '@/services/EBikeService'
 
 //these are fixed values in the database
 const MANUFACTURER_TYPE = 'e-bike'
diff --git a/Website/ui/src/modules/EBikes/EBikeDetailModal.vue b/Website/ui/src/modules/EBikes/EBikeDetailModal.vue
index f67d681b3..0b69d98e1 100644
--- a/Website/ui/src/modules/EBikes/EBikeDetailModal.vue
+++ b/Website/ui/src/modules/EBikes/EBikeDetailModal.vue
@@ -94,10 +94,10 @@
 </template>
 
 <script>
-import Widget from "@/shared/widget.vue";
-import {notify, timing} from "@/mixins";
-import {EBikeService} from "@/services/EBikeService";
-import Box from "@/modules/Box.vue";
+import Widget from '@/shared/widget.vue'
+import {notify, timing} from '@/mixins'
+import {EBikeService} from '@/services/EBikeService'
+import Box from '@/modules/Box.vue'
 
 export default {
     name: 'EBikeDetailModal',
diff --git a/Website/ui/src/modules/EBikes/EBikes.vue b/Website/ui/src/modules/EBikes/EBikes.vue
index 404b093a2..f68924cf3 100644
--- a/Website/ui/src/modules/EBikes/EBikes.vue
+++ b/Website/ui/src/modules/EBikes/EBikes.vue
@@ -55,9 +55,9 @@ import {notify, timing} from '@/mixins'
 import {EventBus} from '@/shared/eventbus'
 import Widget from '@/shared/widget'
 import AddEBikeModal from '@/modules/EBikes/AddEBikeModal.vue'
-import {EBikeService} from "@/services/EBikeService";
-import AddSolarHomeSystemModal from "@/modules/SolarHomeSystem/AddSolarHomeSystemModal.vue";
-import EBikeDetailModal from "@/modules/EBikes/EBikeDetailModal.vue";
+import {EBikeService} from '@/services/EBikeService'
+import AddSolarHomeSystemModal from '@/modules/SolarHomeSystem/AddSolarHomeSystemModal.vue'
+import EBikeDetailModal from '@/modules/EBikes/EBikeDetailModal.vue'
 
 export default {
     name: 'EBikes',
diff --git a/Website/ui/src/modules/Map/ClusterMap.vue b/Website/ui/src/modules/Map/ClusterMap.vue
index 80d02856a..c2e2caf31 100644
--- a/Website/ui/src/modules/Map/ClusterMap.vue
+++ b/Website/ui/src/modules/Map/ClusterMap.vue
@@ -166,7 +166,7 @@ export default {
                 miniGridMarker.bindTooltip('Mini Grid: ' + markingInfo.name)
                 const parent = this
                 miniGridMarker.on('click', function () {
-                    parent.routeToDetail(`/dashboards/mini-grid`,markingInfo.id)
+                    parent.routeToDetail('/dashboards/mini-grid',markingInfo.id)
                 })
                 if (markingInfo.dataStream > 0) {
                     miniGridMarker.addTo(dataLoggerActiveMiniGrids)
diff --git a/Website/ui/src/modules/Map/MiniGridMap.vue b/Website/ui/src/modules/Map/MiniGridMap.vue
index 2f3b40a73..65ac3625c 100644
--- a/Website/ui/src/modules/Map/MiniGridMap.vue
+++ b/Website/ui/src/modules/Map/MiniGridMap.vue
@@ -186,7 +186,7 @@ export default {
         },
         setDeviceMarkers () {
             this.mappingService.markingInfos.filter((markingInfo) => markingInfo.markerType === MARKER_TYPE.METER || markingInfo.markerType === MARKER_TYPE.SHS || markingInfo.markerType === MARKER_TYPE.E_BIKE).map((markingInfo) => {
-               const deviceMarkerIcon = L.icon({
+                const deviceMarkerIcon = L.icon({
                     ...ICON_OPTIONS,
                     iconUrl: ICONS[markingInfo.markerType]
                 })
@@ -271,14 +271,14 @@ export default {
                 const lon = parseFloat(points[1])
                 let markerType = ''
                 switch (device.device_type) {
-                    case 'e_bike':
-                        markerType = MARKER_TYPE.E_BIKE
-                        break
-                    case 'shs':
-                        markerType = MARKER_TYPE.SHS
-                        break
-                    default:
-                        markerType = MARKER_TYPE.METER
+                case 'e_bike':
+                    markerType = MARKER_TYPE.E_BIKE
+                    break
+                case 'shs':
+                    markerType = MARKER_TYPE.SHS
+                    break
+                default:
+                    markerType = MARKER_TYPE.METER
                 }
                 markingInfos.push({
                     id: miniGridWithGeoData.id,
diff --git a/Website/ui/src/modules/Map/VillageMap.vue b/Website/ui/src/modules/Map/VillageMap.vue
index cd9250750..10608df34 100644
--- a/Website/ui/src/modules/Map/VillageMap.vue
+++ b/Website/ui/src/modules/Map/VillageMap.vue
@@ -23,7 +23,7 @@ export default {
                 if (layer.getBounds) {
                     cluster = layer
                 }
-            });
+            })
             const bounds = cluster.getBounds()
             this.removeExistingMarkers()
 
diff --git a/Website/ui/src/modules/Meter/Basic.vue b/Website/ui/src/modules/Meter/Basic.vue
index 7775a5358..cfa7fbf2e 100644
--- a/Website/ui/src/modules/Meter/Basic.vue
+++ b/Website/ui/src/modules/Meter/Basic.vue
@@ -132,7 +132,6 @@ export default {
                         })
                         this.meter.owner = device.person
                         console.log(this.meter.owner)
-                        debugger
                         this.alertNotify('success', 'Updated Successfully.')
                         this.resetOwnerEditing()
                     } catch (e) {
diff --git a/Website/ui/src/modules/MiniGrid/AddMiniGrid.vue b/Website/ui/src/modules/MiniGrid/AddMiniGrid.vue
index ab18a6fe4..d1d4add25 100644
--- a/Website/ui/src/modules/MiniGrid/AddMiniGrid.vue
+++ b/Website/ui/src/modules/MiniGrid/AddMiniGrid.vue
@@ -147,7 +147,7 @@ export default {
     methods: {
         async getClusters () {
             try {
-                 await this.clusterService.getClusters()
+                await this.clusterService.getClusters()
                 if (this.clusterService.list.length) {
                     this.selectedClusterId = this.clusterService.list[this.clusterService.list.length - 1].id
                 } else {
diff --git a/Website/ui/src/modules/MiniGrid/EnergyChartBox.vue b/Website/ui/src/modules/MiniGrid/EnergyChartBox.vue
index ac0efd288..f06bfba4d 100644
--- a/Website/ui/src/modules/MiniGrid/EnergyChartBox.vue
+++ b/Website/ui/src/modules/MiniGrid/EnergyChartBox.vue
@@ -106,7 +106,7 @@ export default {
 
                         return
                     }
-                     this.batteryService.prepareChartData()
+                    this.batteryService.prepareChartData()
                 })
         },
         initPVChart () {
diff --git a/Website/ui/src/modules/MiniGrid/RevenuePerCustomerType.vue b/Website/ui/src/modules/MiniGrid/RevenuePerCustomerType.vue
index dd605aef4..311c31a70 100644
--- a/Website/ui/src/modules/MiniGrid/RevenuePerCustomerType.vue
+++ b/Website/ui/src/modules/MiniGrid/RevenuePerCustomerType.vue
@@ -22,7 +22,6 @@
 
 <script>
 import Widget from '../../shared/widget'
-import { BatchRevenueService } from '@/services/BatchRevenueService'
 import Loader from '@/shared/Loader.vue'
 import { EventBus } from '@/shared/eventbus'
 
diff --git a/Website/ui/src/modules/MiniGrid/TicketsOverview.vue b/Website/ui/src/modules/MiniGrid/TicketsOverview.vue
index e1b0d7115..fa6a763c3 100644
--- a/Website/ui/src/modules/MiniGrid/TicketsOverview.vue
+++ b/Website/ui/src/modules/MiniGrid/TicketsOverview.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-import { RevenueService } from '@/services/RevenueService'
 import Widget from '../../shared/widget'
 import Loader from '@/shared/Loader.vue'
 import { EventBus } from '@/shared/eventbus'
diff --git a/Website/ui/src/modules/Sms/List.vue b/Website/ui/src/modules/Sms/List.vue
index 17d871d49..cfe7e5a4e 100644
--- a/Website/ui/src/modules/Sms/List.vue
+++ b/Website/ui/src/modules/Sms/List.vue
@@ -260,7 +260,6 @@ export default {
             })
         },
         searchSms (text) {
-            debugger
             this.numberList = this.smsService.searchSms(text)
         }
     }
diff --git a/Website/ui/src/modules/Sms/NewSms.vue b/Website/ui/src/modules/Sms/NewSms.vue
index 938168e0d..e306209eb 100644
--- a/Website/ui/src/modules/Sms/NewSms.vue
+++ b/Website/ui/src/modules/Sms/NewSms.vue
@@ -191,7 +191,6 @@ export default {
             this.smsService.resultList = []
         },
         addNumberToReceivers (phone) {
-            debugger
             this.smsService.receiverList.push({
                 id: -1,
                 display: phone,
diff --git a/Website/ui/src/modules/Target/NewTarget.vue b/Website/ui/src/modules/Target/NewTarget.vue
index 9d3ccf9bb..65ae39bf2 100644
--- a/Website/ui/src/modules/Target/NewTarget.vue
+++ b/Website/ui/src/modules/Target/NewTarget.vue
@@ -210,118 +210,118 @@ import {ConnectionTypes} from '@/classes/connection/ConnectionTypes'
 import {NumberOfCustomers} from '@/classes/connection/NumberOfCustomers'
 import {currency} from '@/mixins/currency'
 import {Targets} from '@/classes/target/Targets'
-import {baseUrl} from "@/repositories/Client/AxiosClient";
+import {baseUrl} from '@/repositories/Client/AxiosClient'
 
 export default {
-  name: 'NewTarget',
-  components: {Widget},
-  mixins: [currency],
-  computed: {
-    isMobile() {
-      return this.$store.getters['resolution/getDevice']
-    },
-    total: {
-      cache: false,
-      deep: true,
-      get: function () {
-        let total = {
-          averageRevenuePerMonth: 0,
-          connectedPower: 0,
-          energyPerMonth: 0,
-          newConnection: 0,
-          totalRevenue: 0,
-          totalCustomers: this.numberOfCustomers.total,
-        }
+    name: 'NewTarget',
+    components: {Widget},
+    mixins: [currency],
+    computed: {
+        isMobile() {
+            return this.$store.getters['resolution/getDevice']
+        },
+        total: {
+            cache: false,
+            deep: true,
+            get: function () {
+                let total = {
+                    averageRevenuePerMonth: 0,
+                    connectedPower: 0,
+                    energyPerMonth: 0,
+                    newConnection: 0,
+                    totalRevenue: 0,
+                    totalCustomers: this.numberOfCustomers.total,
+                }
 
-        if (this.connectionTypes.list.length === 0) {
-          return total
-        }
+                if (this.connectionTypes.list.length === 0) {
+                    return total
+                }
 
-        this.connectionTypes.list.reduce(
-            function (prev, next) {
-              prev['averageRevenuePerMonth'] += parseInt(next['target']['averageRevenuePerMonth'])
-              prev['connectedPower'] += parseInt(next['target']['connectedPower'])
-              prev['energyPerMonth'] += parseInt(next['target']['energyPerMonth'])
-              prev['newConnection'] += parseInt(next['target']['newConnection'])
-              prev['totalRevenue'] += parseInt(next['target']['totalRevenue'])
-              return prev
-            }, total
-        )
-        return total
+                this.connectionTypes.list.reduce(
+                    function (prev, next) {
+                        prev['averageRevenuePerMonth'] += parseInt(next['target']['averageRevenuePerMonth'])
+                        prev['connectedPower'] += parseInt(next['target']['connectedPower'])
+                        prev['energyPerMonth'] += parseInt(next['target']['energyPerMonth'])
+                        prev['newConnection'] += parseInt(next['target']['newConnection'])
+                        prev['totalRevenue'] += parseInt(next['target']['totalRevenue'])
+                        return prev
+                    }, total
+                )
+                return total
 
-      }
-    },
+            }
+        },
 
-  },
-  mounted() {
-    this.connectionTypes.getConnectionTypes()
-    this.numberOfCustomers.getList()
-  },
+    },
+    mounted() {
+        this.connectionTypes.getConnectionTypes()
+        this.numberOfCustomers.getList()
+    },
 
-  data() {
-    return {
-      dataIsLoading: false,
-      targetDestinations: [], // mini-grid or cluster list
-      targetAssignType: null, // determines if the target is whether for a mini-grip or for a cluster.
-      targetAssignId: null, //the id of the mini-grid or cluster
-      slotChecker: new AvailablityChecker(),
-      connectionTypes: new ConnectionTypes(),
-      numberOfCustomers: new NumberOfCustomers(),
-      targets: new Targets(),
-      targetValidUntil: new Date(),
-    }
-  },
-  methods: {
-    alertNotify(type, message, title = null) {
-      if (title == null) {
-        title = type.toString().charAt(0).toUpperCase() + type.toString().slice(1)
-      }
-      this.$notify({
-        group: 'notify',
-        type: type,
-        title: type + ' !',
-        text: message
-      })
+    data() {
+        return {
+            dataIsLoading: false,
+            targetDestinations: [], // mini-grid or cluster list
+            targetAssignType: null, // determines if the target is whether for a mini-grip or for a cluster.
+            targetAssignId: null, //the id of the mini-grid or cluster
+            slotChecker: new AvailablityChecker(),
+            connectionTypes: new ConnectionTypes(),
+            numberOfCustomers: new NumberOfCustomers(),
+            targets: new Targets(),
+            targetValidUntil: new Date(),
+        }
     },
-    async submitTarget() {
-      let validation = await this.$validator.validateAll()
-      if (!validation) {
-        this.alertNotify('warn', this.$tc('phrases.newTargetNotify', 1))
-        return
-      }
-      try {
-        await this.targets.store(this.targetValidUntil, this.targetAssignType, this.targetAssignId,
-            this.connectionTypes.list)
-        this.$swal('Success', this.$tc('phrases.newTargetNotify', 2), 'success')
-        this.$router.push({path: '/targets'})
-      } catch (e) {
-        this.alertNotify('error', e.message)
-      }
+    methods: {
+        alertNotify(type, message, title = null) {
+            if (title == null) {
+                title = type.toString().charAt(0).toUpperCase() + type.toString().slice(1)
+            }
+            this.$notify({
+                group: 'notify',
+                type: type,
+                title: type + ' !',
+                text: message
+            })
+        },
+        async submitTarget() {
+            let validation = await this.$validator.validateAll()
+            if (!validation) {
+                this.alertNotify('warn', this.$tc('phrases.newTargetNotify', 1))
+                return
+            }
+            try {
+                await this.targets.store(this.targetValidUntil, this.targetAssignType, this.targetAssignId,
+                    this.connectionTypes.list)
+                this.$swal('Success', this.$tc('phrases.newTargetNotify', 2), 'success')
+                this.$router.push({path: '/targets'})
+            } catch (e) {
+                this.alertNotify('error', e.message)
+            }
 
-      //success message
+            //success message
 
-    },
-    addCustomers(newConnections, connections) {
-      return parseInt(newConnections) + parseInt(connections)
-    },
+        },
+        addCustomers(newConnections, connections) {
+            return parseInt(newConnections) + parseInt(connections)
+        },
 
-    onTargetTypeChange(value) {
-      this.dataIsLoading = true
-      if (value === 'mini-grid') { //get list of mini-grids
-        this.updateTargetDestination(baseUrl + resources.miniGrids.list)
-      } else { //get list of clusters
-        this.updateTargetDestination(baseUrl + resources.clusters.list)
-      }
-    },
+        onTargetTypeChange(value) {
+            this.dataIsLoading = true
+            if (value === 'mini-grid') { //get list of mini-grids
+                this.updateTargetDestination(baseUrl + resources.miniGrids.list)
+            } else { //get list of clusters
+                this.updateTargetDestination(baseUrl + resources.clusters.list)
+            }
+        },
 
-    updateTargetDestination(url) {
-      axios.get(url).then((response) => {
-        this.targetDestinations = response.data.data
-        this.dataIsLoading = false // hide progress bar
-      })
-    },
+        updateTargetDestination(url) {
+            axios.get(url).then((response) => {
+                this.targetDestinations = response.data.data
+                this.dataIsLoading = false // hide progress bar
+            })
+        },
 
-  }
+    }
 }
 </script>
 
diff --git a/Website/ui/src/modules/Ticket/AddExternalTicketingUser.vue b/Website/ui/src/modules/Ticket/AddExternalTicketingUser.vue
index be7af58aa..dff0b5fa7 100644
--- a/Website/ui/src/modules/Ticket/AddExternalTicketingUser.vue
+++ b/Website/ui/src/modules/Ticket/AddExternalTicketingUser.vue
@@ -39,47 +39,47 @@
 </template>
 
 <script>
-import {TicketUserService} from "@/services/TicketUserService";
+import {TicketUserService} from '@/services/TicketUserService'
 import { EventBus } from '@/shared/eventbus'
 
 export default {
-  name: "AddExternalTicketingUser",
-  data ()  {
-      return {
-        subscriber:'ticket-user-add-external',
-        ticketUserService: new TicketUserService(),
-        loading: false,
-      }
-  },
-  mounted(){
-    this.getUsers()
-  },
-
-  methods: {
-    async saveUser () {
-      let validator = await this.$validator.validateAll()
-      if (validator) {
-        this.loading = true
-        try {
-          const userData = await this.ticketUserService.createExternalUser(this.ticketUserService.newUser.name, this.ticketUserService.newUser.phone)
-
-          if (userData.error !== undefined) {
-            this.alertNotify('warn',  this.$tc('phrases.ticketUserNotify',2, {tag: this.ticketUserService.newUser.tag}))
-            this.loading = false
-            return
-          }
-          await this.getUsers()
-          this.alertNotify('success', this.$tc('phrases.ticketUserNotify',1))
-          this.loading = false
-        } catch (e) {
-          this.loading = false
-          this.alertNotify('error', e.message)
+    name: 'AddExternalTicketingUser',
+    data ()  {
+        return {
+            subscriber:'ticket-user-add-external',
+            ticketUserService: new TicketUserService(),
+            loading: false,
         }
-        this.ticketUserService.resetNewUser();
-        EventBus.$emit('ticket.add.user.show', false);
-      }
     },
-  }
+    mounted(){
+        this.getUsers()
+    },
+
+    methods: {
+        async saveUser () {
+            let validator = await this.$validator.validateAll()
+            if (validator) {
+                this.loading = true
+                try {
+                    const userData = await this.ticketUserService.createExternalUser(this.ticketUserService.newUser.name, this.ticketUserService.newUser.phone)
+
+                    if (userData.error !== undefined) {
+                        this.alertNotify('warn',  this.$tc('phrases.ticketUserNotify',2, {tag: this.ticketUserService.newUser.tag}))
+                        this.loading = false
+                        return
+                    }
+                    await this.getUsers()
+                    this.alertNotify('success', this.$tc('phrases.ticketUserNotify',1))
+                    this.loading = false
+                } catch (e) {
+                    this.loading = false
+                    this.alertNotify('error', e.message)
+                }
+                this.ticketUserService.resetNewUser()
+                EventBus.$emit('ticket.add.user.show', false)
+            }
+        },
+    }
 }
 </script>
 
diff --git a/Website/ui/src/modules/Ticket/Tickets.vue b/Website/ui/src/modules/Ticket/Tickets.vue
index c14381768..076f41713 100644
--- a/Website/ui/src/modules/Ticket/Tickets.vue
+++ b/Website/ui/src/modules/Ticket/Tickets.vue
@@ -53,7 +53,7 @@ import {EventBus} from '@/shared/eventbus'
 import Filtering from '@/modules/Ticket/Filtering'
 import {resources} from '@/resources'
 import {TicketService} from '@/services/TicketService'
-import {baseUrl} from "@/repositories/Client/AxiosClient";
+import {baseUrl} from '@/repositories/Client/AxiosClient'
 export default {
     name: 'Tickets',
     components: {Filtering, Widget, TicketItem},
diff --git a/Website/ui/src/modules/Transactions/FilterTransaction.vue b/Website/ui/src/modules/Transactions/FilterTransaction.vue
index 357614bca..1917866ac 100644
--- a/Website/ui/src/modules/Transactions/FilterTransaction.vue
+++ b/Website/ui/src/modules/Transactions/FilterTransaction.vue
@@ -116,8 +116,8 @@ import {EventBus} from '@/shared/eventbus'
 import {TransactionProviderService} from '@/services/TransactionProviderService'
 import {mapGetters} from 'vuex'
 import moment from 'moment-timezone'
-import store from "@/store/store";
-import {TransactionExportService} from "@/services/TransactionExportService";
+import store from '@/store/store'
+import {TransactionExportService} from '@/services/TransactionExportService'
 
 export default {
     name: 'FilterTransaction',
@@ -191,18 +191,18 @@ export default {
         },
         seTransaction (transaction) {
             switch (transaction) {
-                case 'All':
-                    this.filter.status = 'all'
-                    break
-                case 'Only Approved':
-                    this.filter.status = '1'
-                    break
-                case 'Only Rejected':
-                    this.filter.status = '-1'
-                    break
+            case 'All':
+                this.filter.status = 'all'
+                break
+            case 'Only Approved':
+                this.filter.status = '1'
+                break
+            case 'Only Rejected':
+                this.filter.status = '-1'
+                break
 
-                default:
-                    break
+            default:
+                break
             }
         },
         submitFilter () {
@@ -218,7 +218,7 @@ export default {
                 timeZone: moment.tz.guess(),
                 currency: store.getters['settings/getMainSettings'].currency
             }
-            const email = this.$store.getters['auth/getAuthenticateUser'].email;
+            const email = this.$store.getters['auth/getAuthenticateUser'].email
             window.open(this.transactionExportService.exportTransactions(email, data))
         },
         getSearch () {
diff --git a/Website/ui/src/modules/Transactions/Transaction.vue b/Website/ui/src/modules/Transactions/Transaction.vue
index 588d436ad..1648c00ae 100644
--- a/Website/ui/src/modules/Transactions/Transaction.vue
+++ b/Website/ui/src/modules/Transactions/Transaction.vue
@@ -206,9 +206,7 @@
 <script>
 import { timing } from '@/mixins/timing'
 import { currency } from '@/mixins/currency'
-import VodacomTransactionDetail from '@/modules/Transactions/VodacomTransactionDetail'
 import PaymentHistoryChart from '@/modules/Transactions/PaymentHistoryChart'
-import AirtelTransactionDetail from '@/modules/Transactions/AirtelTransactionDetail'
 import AgentTransactionDetail from '@/modules/Agent/AgentTransactionDetail'
 import Widget from '@/shared/widget'
 import { TransactionService } from '@/services/TransactionService'
@@ -246,22 +244,22 @@ export default {
         providerDetail () {
             const transactionType = this.transaction.original_transaction_type
             switch (transactionType) {
-                case 'vodacom_transaction':
-                    return 'VodacomTransactionDetail'
-                case 'airtel_transaction':
-                    return 'AirtelTransactionDetail'
-                case 'agent_transaction':
-                    return 'AgentTransactionDetail'
-                case 'third_party_transaction':
-                    return 'ThirdPartyTransactionDetail'
-                case 'wave_money_transaction':
-                    return 'WaveMoneyTransactionDetail'
-                case 'swifta_transaction':
-                    return 'SwiftaTransactionDetail'
-                case 'wavecom_transaction':
-                    return 'WaveComTransactionDetail'
-                default:
-                    return null
+            case 'vodacom_transaction':
+                return 'VodacomTransactionDetail'
+            case 'airtel_transaction':
+                return 'AirtelTransactionDetail'
+            case 'agent_transaction':
+                return 'AgentTransactionDetail'
+            case 'third_party_transaction':
+                return 'ThirdPartyTransactionDetail'
+            case 'wave_money_transaction':
+                return 'WaveMoneyTransactionDetail'
+            case 'swifta_transaction':
+                return 'SwiftaTransactionDetail'
+            case 'wavecom_transaction':
+                return 'WaveComTransactionDetail'
+            default:
+                return null
             }
         },
     },
diff --git a/Website/ui/src/modules/Transactions/Transactions.vue b/Website/ui/src/modules/Transactions/Transactions.vue
index 823d3a5d7..4f02f1a51 100644
--- a/Website/ui/src/modules/Transactions/Transactions.vue
+++ b/Website/ui/src/modules/Transactions/Transactions.vue
@@ -404,24 +404,24 @@ export default {
         getPeriod (period = 'Yesterday') {
 
             switch (period) {
-                case 'Yesterday':
-                    this.analyticsPeriod = 0
-                    break
+            case 'Yesterday':
+                this.analyticsPeriod = 0
+                break
 
-                case 'Same day last week':
-                    this.analyticsPeriod = 1
-                    break
+            case 'Same day last week':
+                this.analyticsPeriod = 1
+                break
 
-                case 'Past 7 days':
-                    this.analyticsPeriod = 2
-                    break
+            case 'Past 7 days':
+                this.analyticsPeriod = 2
+                break
 
-                case 'Past 30 days':
-                    this.analyticsPeriod = 3
-                    break
+            case 'Past 30 days':
+                this.analyticsPeriod = 3
+                break
 
-                default:
-                    break
+            default:
+                break
             }
 
             this.loadAnalytics()
diff --git a/Website/ui/src/pages/Dashboard/MiniGrid/index.vue b/Website/ui/src/pages/Dashboard/MiniGrid/index.vue
index 6b974c476..860806273 100644
--- a/Website/ui/src/pages/Dashboard/MiniGrid/index.vue
+++ b/Website/ui/src/pages/Dashboard/MiniGrid/index.vue
@@ -14,7 +14,7 @@ export default {
     created () {
         const miniGridId = this.$route.params.id
         if (miniGridId === undefined) {
-             this.redirectToFirstMiniGrid()
+            this.redirectToFirstMiniGrid()
         }
     },
     data () {
diff --git a/Website/ui/src/pages/ForgotPassword/index.vue b/Website/ui/src/pages/ForgotPassword/index.vue
index 2b6dd4a0d..260953a24 100644
--- a/Website/ui/src/pages/ForgotPassword/index.vue
+++ b/Website/ui/src/pages/ForgotPassword/index.vue
@@ -5,9 +5,9 @@
 import ForgotPassword from '@/modules/ForgotPassword/ForgotPassword.vue'
 export default {
     name: 'ForgotPasswordPage',
-   components:{
+    components:{
         ForgotPassword
-   }
+    }
 
 }
 </script>
diff --git a/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue b/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue
index 516663f2a..3317c9035 100644
--- a/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue
+++ b/Website/ui/src/plugins/steama-meter/js/modules/Shared/Widget.vue
@@ -185,7 +185,6 @@ export default {
         },
         checkDataLength (subscriber, dataLength) {
             console.log(subscriber, dataLength)
-            debugger
             if (!this.validateSubscriber(subscriber)) {
                 return
             }
diff --git a/Website/ui/src/plugins/steama-meter/js/routes.js b/Website/ui/src/plugins/steama-meter/js/routes.js
index 1cdbd98ba..a6b11ee8b 100644
--- a/Website/ui/src/plugins/steama-meter/js/routes.js
+++ b/Website/ui/src/plugins/steama-meter/js/routes.js
@@ -36,4 +36,4 @@ let routes = [
         meta: { layout: 'default' },
     },
 
-    ]
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/Website/ui/src/plugins/swifta-payment-provider/js/modules/Component.vue b/Website/ui/src/plugins/swifta-payment-provider/js/modules/Component.vue
index b40d44142..b4512a75f 100644
--- a/Website/ui/src/plugins/swifta-payment-provider/js/modules/Component.vue
+++ b/Website/ui/src/plugins/swifta-payment-provider/js/modules/Component.vue
@@ -2,10 +2,10 @@
 
 </template>
 <script>
-  export default {
+export default {
     name: 'Component',
     data () {
-      return {}
+        return {}
     },
     mounted () {
 
@@ -16,7 +16,7 @@
     methods: {
 
     }
-  }
+}
 </script>
 <style scoped>
 
diff --git a/Website/ui/src/plugins/viber-messaging/js/modules/Component.vue b/Website/ui/src/plugins/viber-messaging/js/modules/Component.vue
index b40d44142..b4512a75f 100644
--- a/Website/ui/src/plugins/viber-messaging/js/modules/Component.vue
+++ b/Website/ui/src/plugins/viber-messaging/js/modules/Component.vue
@@ -2,10 +2,10 @@
 
 </template>
 <script>
-  export default {
+export default {
     name: 'Component',
     data () {
-      return {}
+        return {}
     },
     mounted () {
 
@@ -16,7 +16,7 @@
     methods: {
 
     }
-  }
+}
 </script>
 <style scoped>
 
diff --git a/Website/ui/src/plugins/wave-money-payment-provider/js/modules/Component.vue b/Website/ui/src/plugins/wave-money-payment-provider/js/modules/Component.vue
index b40d44142..b4512a75f 100644
--- a/Website/ui/src/plugins/wave-money-payment-provider/js/modules/Component.vue
+++ b/Website/ui/src/plugins/wave-money-payment-provider/js/modules/Component.vue
@@ -2,10 +2,10 @@
 
 </template>
 <script>
-  export default {
+export default {
     name: 'Component',
     data () {
-      return {}
+        return {}
     },
     mounted () {
 
@@ -16,7 +16,7 @@
     methods: {
 
     }
-  }
+}
 </script>
 <style scoped>
 
diff --git a/Website/ui/src/plugins/wavecom-payment-provider/js/modules/Component.vue b/Website/ui/src/plugins/wavecom-payment-provider/js/modules/Component.vue
index dc1f84bc7..dc90c9ca8 100644
--- a/Website/ui/src/plugins/wavecom-payment-provider/js/modules/Component.vue
+++ b/Website/ui/src/plugins/wavecom-payment-provider/js/modules/Component.vue
@@ -86,8 +86,8 @@
 </template>
 
 <script>
-import Widget from "@/plugins/bulk-registration/js/modules/Shared/Widget.vue";
-import {WaveComService} from "@/plugins/wavecom-payment-provider/js/services/WaveComService";
+import Widget from '@/plugins/bulk-registration/js/modules/Shared/Widget.vue'
+import {WaveComService} from '@/plugins/wavecom-payment-provider/js/services/WaveComService'
 
 export default {
     name: 'WaveComTransaction',
diff --git a/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js b/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js
index 816596cc7..e0f657c64 100644
--- a/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js
+++ b/Website/ui/src/plugins/wavecom-payment-provider/js/routes.js
@@ -1,5 +1,5 @@
 let routes = [
-  {
+    {
         path: '/wavecom/transactions',
         component: require('./plugins/wave-money-payment-provider/js/components/Component').default,
         meta: { layout: 'default' },
diff --git a/Website/ui/src/repositories/Client/AxiosClient.js b/Website/ui/src/repositories/Client/AxiosClient.js
index f083c537c..0d94632e3 100644
--- a/Website/ui/src/repositories/Client/AxiosClient.js
+++ b/Website/ui/src/repositories/Client/AxiosClient.js
@@ -17,8 +17,8 @@ function  getBaseUrl () {
 export const baseUrl = getBaseUrl()
 
 const axiosClient = axios.create({
-        timeout: 120000, // Set the timeout to 120 seconds (adjust as needed)
-    }
+    timeout: 120000, // Set the timeout to 120 seconds (adjust as needed)
+}
 )
 
 axiosClient.interceptors.request.use(
diff --git a/Website/ui/src/repositories/Client/OpenCageData.js b/Website/ui/src/repositories/Client/OpenCageData.js
index 3ca6f0e25..0189c7892 100644
--- a/Website/ui/src/repositories/Client/OpenCageData.js
+++ b/Website/ui/src/repositories/Client/OpenCageData.js
@@ -12,7 +12,7 @@ export const getGeoDataFromAddress = async (address) => {
         const { data } = await axios.get(OPEN_CAGE_DATA_URI, { params: { q: address, key: API_KEY } })
         return data.results
     } catch (error) {
-       throw error
+        throw error
     }
 
 }
\ No newline at end of file
diff --git a/Website/ui/src/resources.js b/Website/ui/src/resources.js
index ff4249e8c..deb210db9 100644
--- a/Website/ui/src/resources.js
+++ b/Website/ui/src/resources.js
@@ -46,9 +46,9 @@ export let resources = {
         person: '/api/maintenance/user'
     },
     person: {
-        'create': `/api/people`,
-        'update': `/api/people/`,
-        'detail': `/api/people/`,
+        'create': '/api/people',
+        'update': '/api/people/',
+        'detail': '/api/people/',
         'delete': '/api/people/',
         'search': '/api/people/search',
         'list': '/api/people',
diff --git a/Website/ui/src/services/AgentTicketService.js b/Website/ui/src/services/AgentTicketService.js
index beda562b6..0fac71b86 100644
--- a/Website/ui/src/services/AgentTicketService.js
+++ b/Website/ui/src/services/AgentTicketService.js
@@ -13,20 +13,20 @@ export class AgentTicketService {
     async updateList (data) {
         this.list = []
         this.list = data?.data?.map((ticket) => {
-                return {
-                    created: ticket.created_at,
-                    id: ticket.id,
-                    name: ticket.name,
-                    description: ticket.content,
-                    due: ticket.due,
-                    closed: ticket.status === 1,
-                    lastActivity: null,
-                    comments: ticket.comments,
-                    category: ticket.category.label_name,
-                    owner: ticket.owner.name + ticket.owner.surname,
-                    assigned: ticket.assigned_id &&  ticket.assigned_to? ticket.assigned_to.user_name : null,
-                    title: ticket.title,
-                };
-            });
+            return {
+                created: ticket.created_at,
+                id: ticket.id,
+                name: ticket.name,
+                description: ticket.content,
+                due: ticket.due,
+                closed: ticket.status === 1,
+                lastActivity: null,
+                comments: ticket.comments,
+                category: ticket.category.label_name,
+                owner: ticket.owner.name + ticket.owner.surname,
+                assigned: ticket.assigned_id &&  ticket.assigned_to? ticket.assigned_to.user_name : null,
+                title: ticket.title,
+            }
+        })
     }
 }
diff --git a/Website/ui/src/services/DeviceService.js b/Website/ui/src/services/DeviceService.js
index fc37a03f1..8ebc511c6 100644
--- a/Website/ui/src/services/DeviceService.js
+++ b/Website/ui/src/services/DeviceService.js
@@ -29,7 +29,7 @@ export class DeviceService {
 
             const { data, status, error } = await this.repository.list()
             if (status !== 200) return new ErrorHandler(error, 'http', status)
-            this.list =  data.data.map(device => convertObjectKeysToCamelCase(device));
+            this.list =  data.data.map(device => convertObjectKeysToCamelCase(device))
 
             return this.list
         } catch (e) {
diff --git a/Website/ui/src/services/MappingService.js b/Website/ui/src/services/MappingService.js
index f3f9669f2..444cb5fac 100644
--- a/Website/ui/src/services/MappingService.js
+++ b/Website/ui/src/services/MappingService.js
@@ -70,14 +70,14 @@ export class MappingService {
     filterResultsOut (geoData, filteredTypes) {
         this.searchedOrDrawnItems = []
         return geoData.filter(data => {
-                const geoType = data.geojson.type.toLowerCase()
+            const geoType = data.geojson.type.toLowerCase()
 
-                if (Object.keys(filteredTypes).length > 0 && !(geoType in filteredTypes)) {
-                    return false
-                }
-                data.searched = true
-                return true
-            })
+            if (Object.keys(filteredTypes).length > 0 && !(geoType in filteredTypes)) {
+                return false
+            }
+            data.searched = true
+            return true
+        })
     }
 
     strToHex (str) {
@@ -102,20 +102,20 @@ export class MappingService {
     }
 
     manualDrawingLocationConvert(geoDataItem) {
-        const locations = [];
+        const locations = []
         for (const coordinates of geoDataItem.geojson.coordinates) {
             for (const coordinate of coordinates) {
-                const { lat, lng } = coordinate;
+                const { lat, lng } = coordinate
                 if (lat === undefined && lng === undefined) {
-                    locations.push(coordinate);
+                    locations.push(coordinate)
                 } else {
-                    locations.push([lat, lng]);
+                    locations.push([lat, lng])
                 }
             }
         }
-        geoDataItem.geojson.coordinates[0] = [...locations];
+        geoDataItem.geojson.coordinates[0] = [...locations]
 
-        return geoDataItem;
+        return geoDataItem
     }
 
 
diff --git a/Website/ui/src/services/SolarHomeSystemService.js b/Website/ui/src/services/SolarHomeSystemService.js
index 2512e0d33..4725437f6 100644
--- a/Website/ui/src/services/SolarHomeSystemService.js
+++ b/Website/ui/src/services/SolarHomeSystemService.js
@@ -2,7 +2,6 @@ import RepositoryFactory from '@/repositories/RepositoryFactory'
 import { Paginator } from '@/classes/paginator'
 import { convertObjectKeysToCamelCase, convertObjectKeysToSnakeCase } from '@/Helpers/Utils'
 import { ErrorHandler } from '@/Helpers/ErrorHander'
-import { resources } from '@/resources'
 import { EventBus } from '@/shared/eventbus'
 
 export class SolarHomeSystemService {
diff --git a/Website/ui/src/services/TariffService.js b/Website/ui/src/services/TariffService.js
index 500a4ca7e..4a629bb8b 100644
--- a/Website/ui/src/services/TariffService.js
+++ b/Website/ui/src/services/TariffService.js
@@ -178,12 +178,11 @@ export class TariffService {
             }
         }
         try {
-            let response
             if (method === 'create') {
-                response = await this.repository.create(tariffPM)
+                await this.repository.create(tariffPM)
             } else {
                 tariffPM.id = this.tariff.id
-                response = await this.repository.update(tariffPM)
+                await this.repository.update(tariffPM)
             }
 
         } catch (e) {
diff --git a/Website/ui/src/services/TicketService.js b/Website/ui/src/services/TicketService.js
index ca7bfb223..0a9905204 100644
--- a/Website/ui/src/services/TicketService.js
+++ b/Website/ui/src/services/TicketService.js
@@ -38,12 +38,12 @@ export class TicketService {
                 owner: ticket.owner.name + ticket.owner.surname,
                 assigned: ticket.assigned_id &&  ticket.assigned_to? ticket.assigned_to.user_name : null,
                 title: ticket.title,
-            };
-        });
+            }
+        })
         if (type === 'ticketListOpened')
-            this.openedList = result;
+            this.openedList = result
         else
-            this.closedList = result;
+            this.closedList = result
 
     }
 
diff --git a/Website/ui/src/services/TicketUserService.js b/Website/ui/src/services/TicketUserService.js
index 71c8e931a..b120582a8 100644
--- a/Website/ui/src/services/TicketUserService.js
+++ b/Website/ui/src/services/TicketUserService.js
@@ -29,14 +29,14 @@ export class TicketUserService {
 
     async getAvailableUsers() {
         try {
-            const response = await this.repository.getAvailableUsers();
+            const response = await this.repository.getAvailableUsers()
             if(response.status === 200) {
-                this.availableUserList = response.data.data;
+                this.availableUserList = response.data.data
             } else {
                 new ErrorHandler(response.error, 'http', response.status)
             }
         } catch (e) {
-            new ErrorHandler(e.response.data.data.message);
+            new ErrorHandler(e.response.data.data.message)
         }
     }
 
diff --git a/Website/ui/src/services/TransactionExportService.js b/Website/ui/src/services/TransactionExportService.js
index 7f747b20f..e1115c950 100644
--- a/Website/ui/src/services/TransactionExportService.js
+++ b/Website/ui/src/services/TransactionExportService.js
@@ -6,13 +6,13 @@ export class TransactionExportService {
     }
 
     exportTransactions (email, payload) {
-        const queryParameters = [];
+        const queryParameters = []
         for (const key in payload) {
             if (payload.hasOwnProperty(key) && payload[key] !== null) {
-                queryParameters.push(`${encodeURIComponent(key)}=${encodeURIComponent(payload[key])}`);
+                queryParameters.push(`${encodeURIComponent(key)}=${encodeURIComponent(payload[key])}`)
             }
         }
-        const slug = queryParameters.join('&');
+        const slug = queryParameters.join('&')
         return this.repository.download(email, slug)
     }
 }
diff --git a/Website/ui/src/services/UserService.js b/Website/ui/src/services/UserService.js
index 5200de59b..783f7aee4 100644
--- a/Website/ui/src/services/UserService.js
+++ b/Website/ui/src/services/UserService.js
@@ -18,7 +18,6 @@ export class UserService {
         }
     }
     fromJson (user) {
-        debugger
         this.user = {
             id: user.id,
             name: user.name,
diff --git a/Website/ui/src/shared/TailWizard.vue b/Website/ui/src/shared/TailWizard.vue
index 98e312132..d0384c7f6 100644
--- a/Website/ui/src/shared/TailWizard.vue
+++ b/Website/ui/src/shared/TailWizard.vue
@@ -30,74 +30,74 @@ import {EventBus} from '@/shared/eventbus'
 import {RegistrationTailService} from '@/services/RegistrationTailService'
 
 export default {
-  name: 'TailWizard',
-  props: {
-    showWizard: {
-      type: Boolean,
-      required: true
-    },
-    tail: {
-      type: Array,
-      required: true
-    }
-  },
-  mounted() {
-    this.wizardIsVisible = this.showWizard
-    if(this.tail && this.tail.length ) {
-      for (const tailObj of this.tail) {
-        if ('tag' in tailObj) {
-          EventBus.$on(tailObj.tag, () => {
-            this.updateRegistrationTail(tailObj.tag)
-          })
+    name: 'TailWizard',
+    props: {
+        showWizard: {
+            type: Boolean,
+            required: true
+        },
+        tail: {
+            type: Array,
+            required: true
         }
-      }
+    },
+    mounted() {
+        this.wizardIsVisible = this.showWizard
+        if(this.tail && this.tail.length ) {
+            for (const tailObj of this.tail) {
+                if ('tag' in tailObj) {
+                    EventBus.$on(tailObj.tag, () => {
+                        this.updateRegistrationTail(tailObj.tag)
+                    })
+                }
+            }
 
-      this.activeStep = this.tail[0].tag
-    }
-  },
-  data() {
-    return {
-      loadingNextStep: false,
-      activeStep: '',
-      wizardIsVisible: false,
-      registrationTailService: new RegistrationTailService()
-    }
-  },
-  methods: {
-    nextStep(step, nextStep) {
-      if (nextStep) {
-        this.activeStep = nextStep.tag
-      } else {
-        this.activeStep = null
-        this.wizardIsVisible = false
-        this.$store.commit('registrationTail/SET_IS_WIZARD_SHOWN', true)
-      }
+            this.activeStep = this.tail[0].tag
+        }
+    },
+    data() {
+        return {
+            loadingNextStep: false,
+            activeStep: '',
+            wizardIsVisible: false,
+            registrationTailService: new RegistrationTailService()
+        }
     },
+    methods: {
+        nextStep(step, nextStep) {
+            if (nextStep) {
+                this.activeStep = nextStep.tag
+            } else {
+                this.activeStep = null
+                this.wizardIsVisible = false
+                this.$store.commit('registrationTail/SET_IS_WIZARD_SHOWN', true)
+            }
+        },
 
-    async updateRegistrationTail(tag) {
-      this.loadingNextStep = true
-      try {
-        const tailId = this.$store.getters['registrationTail/getTail'].id
-        await this.registrationTailService.updateRegistrationTail(tailId, tag, this.tail)
-        const step = tag;
-        let stepIndex = 0;
-        for (let i = 0; i < this.tail.length; i++) {
-          for (let [k, v] of Object.entries(this.tail[i])) {
-            if (k === 'tag' && v === step) {
-              stepIndex = i
-              break
+        async updateRegistrationTail(tag) {
+            this.loadingNextStep = true
+            try {
+                const tailId = this.$store.getters['registrationTail/getTail'].id
+                await this.registrationTailService.updateRegistrationTail(tailId, tag, this.tail)
+                const step = tag
+                let stepIndex = 0
+                for (let i = 0; i < this.tail.length; i++) {
+                    for (let [k, v] of Object.entries(this.tail[i])) {
+                        if (k === 'tag' && v === step) {
+                            stepIndex = i
+                            break
+                        }
+                    }
+                }
+                const nextStep = this.tail[stepIndex + 1]
+                this.$store.commit('registrationTail/SET_REGISTRATION_TAIL', this.registrationTailService.registrationTail)
+                this.nextStep(step, nextStep)
+            } catch (e) {
+                this.alertNotify('error', e.message)
             }
-          }
-        }
-        const nextStep = this.tail[stepIndex + 1]
-        this.$store.commit('registrationTail/SET_REGISTRATION_TAIL', this.registrationTailService.registrationTail)
-        this.nextStep(step, nextStep)
-      } catch (e) {
-        this.alertNotify('error', e.message)
-      }
 
+        }
     }
-  }
 }
 </script>
 
diff --git a/Website/ui/src/shared/TicketItem.vue b/Website/ui/src/shared/TicketItem.vue
index a8d3a5272..4f524e8e6 100644
--- a/Website/ui/src/shared/TicketItem.vue
+++ b/Website/ui/src/shared/TicketItem.vue
@@ -108,87 +108,87 @@ import {TicketService} from '@/services/TicketService'
 import moment from 'moment'
 
 export default {
-  name: 'TicketItem',
-  props: {
-
-    ticket: String,
-    allowComment: Boolean,
-    ticketList: Array,
-    tableHeads: Array,
-    allowLock: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      ticketCommentService: new TicketCommentService(),
-      ticketService: new TicketService(),
-      smsService: new SmsService(),
-      showComments: false,
-      newComment: '',
-      showTicket: null,
-      senderId: this.$store.getters['auth/authenticationService'].authenticateUser.id,
-    }
-  },
-  mounted() {
-    console.log("mounted", this.ticketList)
-  },
-  methods: {
-    getTimeAgo(date) {
-      return moment(date).fromNow()
-    },
-    formatDate(date) {
-      let d = new Date(date)
-      return d.toLocaleDateString()
-    },
-    openTicket(index) {
-      if (this.showTicket === index) {
-        this.showTicket = null
-      } else {
-        this.showTicket = index
-      }
-    },
-    navigateToOwner(id) {
-      this.$router.push({path: '/people/' + id})
-    },
-    async lockTicket(ticket) {
-      try {
-        await this.ticketService.closeTicket(ticket.id)
-        EventBus.$emit('listChanged')
-        this.alertNotify('success', this.$tc('phrases.ticketNotify', 1))
-      } catch (e) {
-        this.alertNotify('error', e.message)
-      }
+    name: 'TicketItem',
+    props: {
+
+        ticket: String,
+        allowComment: Boolean,
+        ticketList: Array,
+        tableHeads: Array,
+        allowLock: {
+            type: Boolean,
+            default: true
+        }
     },
-
-    async sendComment(ticket) {
-      try {
-        let name = this.$store.getters['auth/authenticationService'].authenticateUser.name
-        let username = this.$store.getters['auth/authenticationService'].authenticateUser.email
-        let newComment = await this.ticketCommentService.createComment(this.newComment, ticket.id, name, username)
-        if (ticket.category !== null && ticket.category.out_source) {
-          await this.smsService.sendToPerson(this.newComment, ticket.owner.id, this.senderId)
+    data() {
+        return {
+            ticketCommentService: new TicketCommentService(),
+            ticketService: new TicketService(),
+            smsService: new SmsService(),
+            showComments: false,
+            newComment: '',
+            showTicket: null,
+            senderId: this.$store.getters['auth/authenticationService'].authenticateUser.id,
         }
-        this.showComments = false
-        EventBus.$emit('listChanged')
-        this.alertNotify('success', this.$tc('phrases.ticketNotify', 2))
-        ticket.comments.push(newComment)
-        this.showComments = false
-        this.newComment = null
-      } catch (e) {
-        this.alertNotify('error', e.message)
-      }
     },
-    alertNotify(type, message) {
-      this.$notify({
-        group: 'notify',
-        type: type,
-        title: type + ' !',
-        text: message
-      })
+    mounted() {
+        console.log('mounted', this.ticketList)
+    },
+    methods: {
+        getTimeAgo(date) {
+            return moment(date).fromNow()
+        },
+        formatDate(date) {
+            let d = new Date(date)
+            return d.toLocaleDateString()
+        },
+        openTicket(index) {
+            if (this.showTicket === index) {
+                this.showTicket = null
+            } else {
+                this.showTicket = index
+            }
+        },
+        navigateToOwner(id) {
+            this.$router.push({path: '/people/' + id})
+        },
+        async lockTicket(ticket) {
+            try {
+                await this.ticketService.closeTicket(ticket.id)
+                EventBus.$emit('listChanged')
+                this.alertNotify('success', this.$tc('phrases.ticketNotify', 1))
+            } catch (e) {
+                this.alertNotify('error', e.message)
+            }
+        },
+
+        async sendComment(ticket) {
+            try {
+                let name = this.$store.getters['auth/authenticationService'].authenticateUser.name
+                let username = this.$store.getters['auth/authenticationService'].authenticateUser.email
+                let newComment = await this.ticketCommentService.createComment(this.newComment, ticket.id, name, username)
+                if (ticket.category !== null && ticket.category.out_source) {
+                    await this.smsService.sendToPerson(this.newComment, ticket.owner.id, this.senderId)
+                }
+                this.showComments = false
+                EventBus.$emit('listChanged')
+                this.alertNotify('success', this.$tc('phrases.ticketNotify', 2))
+                ticket.comments.push(newComment)
+                this.showComments = false
+                this.newComment = null
+            } catch (e) {
+                this.alertNotify('error', e.message)
+            }
+        },
+        alertNotify(type, message) {
+            this.$notify({
+                group: 'notify',
+                type: type,
+                title: type + ' !',
+                text: message
+            })
+        },
     },
-  },
 }
 </script>
 
diff --git a/Website/ui/src/store/store.js b/Website/ui/src/store/store.js
index e659ed5a1..ade61a590 100644
--- a/Website/ui/src/store/store.js
+++ b/Website/ui/src/store/store.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import { Person } from '@/classes/person'
-import { Meters } from '@/classes/person/meters'
 import * as auth from '@/store/modules/authentication'
 import * as settings from '@/store/modules/settings'
 import * as resolution from '@/store/modules/resolution'