diff --git a/.gitignore b/.gitignore
index d7e739e8..5649354a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ next-env.d.ts
 # homepage
 /config
 
+# IDEs
 /.idea/
 
-/config/
+
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 77a86a88..2ff6b220 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -390,9 +390,9 @@
         "no_devices": "No Device Data Received"
     },
     "mikrotik": {
-        "cpuload": "CPU Load",
-        "memoryused": "Memory Used",
+        "cpuLoad": "CPU Load",
+        "memoryUsed": "Memory Used",
         "uptime": "Uptime",
-        "numberofleases": "Leases"
+        "numberOfLeases": "Leases"
     }
 }
diff --git a/src/widgets/mikrotik/component.jsx b/src/widgets/mikrotik/component.jsx
index 3cd82125..37a8f706 100644
--- a/src/widgets/mikrotik/component.jsx
+++ b/src/widgets/mikrotik/component.jsx
@@ -21,23 +21,23 @@ export default function Component({ service }) {
     return (
       <Container service={service}>
         <Block label="mikrotik.uptime" />
-        <Block label="mikrotik.cpuload" />
-        <Block label="mikrotik.memoryused" />
-        <Block label="mikrotik.numberofleases" />
+        <Block label="mikrotik.cpuLoad" />
+        <Block label="mikrotik.memoryUsed" />
+        <Block label="mikrotik.numberOfLeases" />
       </Container>
     );
   }
 
-  const memoryused = 100 - (statsData['free-memory'] / statsData['total-memory'])*100
+  const memoryUsed = 100 - (statsData['free-memory'] / statsData['total-memory'])*100
 
-  const numberofleases = leasesData.length
+  const numberOfLeases = leasesData.length
 
   return (
     <Container service={service}>
       <Block label="mikrotik.uptime" value={ statsData.uptime } />
-      <Block label="mikrotik.cpuload" value={t("common.percent", { value: statsData['cpu-load'] })} />
-      <Block label="mikrotik.memoryused" value={t("common.percent", { value: memoryused })} />
-      <Block label="mikrotik.numberofleases" value={t("common.number", { value: numberofleases })} />
+      <Block label="mikrotik.cpuLoad" value={t("common.percent", { value: statsData['cpu-load'] })} />
+      <Block label="mikrotik.memoryUsed" value={t("common.percent", { value: memoryUsed })} />
+      <Block label="mikrotik.numberOfLeases" value={t("common.number", { value: numberOfLeases })} />
     </Container>
   );
 }
diff --git a/src/widgets/mikrotik/widget.js b/src/widgets/mikrotik/widget.js
index 86b0b522..dfb5f626 100644
--- a/src/widgets/mikrotik/widget.js
+++ b/src/widgets/mikrotik/widget.js
@@ -8,6 +8,12 @@ const widget = {
   mappings: {
     system: {
       endpoint: "system/resource",
+      validate: [
+        "cpu-load",
+        "free-memory",
+        "total-memory",
+        "uptime"
+      ]
     },
     leases: {
       endpoint: "ip/dhcp-server/lease",