diff --git a/new-lamassu-admin/.eslintrc.js b/new-lamassu-admin/.eslintrc.js
index dba68953..be04ae0f 100644
--- a/new-lamassu-admin/.eslintrc.js
+++ b/new-lamassu-admin/.eslintrc.js
@@ -15,11 +15,9 @@ module.exports = {
   rules: {
     'import/order': ['error', {
       groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
-      // TODO 
-      // bug in this version doens't allow alphabetize with newlines-between
-      // alphabetize: {
-      //   order: 'asc',
-      // },
+      alphabetize: {
+        order: 'asc'
+      },
       'newlines-between': 'always',
     }]
    }
diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json
index f53f38fd..89443b27 100644
--- a/new-lamassu-admin/package-lock.json
+++ b/new-lamassu-admin/package-lock.json
@@ -9987,9 +9987,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz",
-      "integrity": "sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz",
+      "integrity": "sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==",
       "dev": true,
       "requires": {
         "array-includes": "^3.0.3",
@@ -10032,9 +10032,9 @@
           "dev": true
         },
         "resolve": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
-          "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
+          "version": "1.15.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+          "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
           "dev": true,
           "requires": {
             "path-parse": "^1.0.6"
@@ -25286,8 +25286,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -25330,8 +25329,7 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
@@ -25342,8 +25340,7 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -25460,8 +25457,7 @@
             "inherits": {
               "version": "2.0.4",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -25473,7 +25469,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -25503,7 +25498,6 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -25522,7 +25516,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -25625,7 +25618,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -25711,8 +25703,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -25748,7 +25739,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -25768,7 +25758,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -25812,14 +25801,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json
index 6e150063..a51ee905 100644
--- a/new-lamassu-admin/package.json
+++ b/new-lamassu-admin/package.json
@@ -41,7 +41,7 @@
     "eslint-config-prettier-standard": "^3.0.1",
     "eslint-config-standard": "^14.1.0",
     "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-promise": "^4.2.1",
diff --git a/new-lamassu-admin/src/pages/Logs.js b/new-lamassu-admin/src/pages/MachineLogs.js
similarity index 100%
rename from new-lamassu-admin/src/pages/Logs.js
rename to new-lamassu-admin/src/pages/MachineLogs.js
index 4f21d6fc..ceaf864c 100644
--- a/new-lamassu-admin/src/pages/Logs.js
+++ b/new-lamassu-admin/src/pages/MachineLogs.js
@@ -1,10 +1,10 @@
+import { useQuery, useMutation } from '@apollo/react-hooks'
 import { makeStyles } from '@material-ui/core/styles'
+import { gql } from 'apollo-boost'
 import FileSaver from 'file-saver'
 import moment from 'moment'
 import * as R from 'ramda'
 import React, { useState } from 'react'
-import { useQuery, useMutation } from '@apollo/react-hooks'
-import { gql } from 'apollo-boost'
 
 import Sidebar from 'src/components/Sidebar'
 import Title from 'src/components/Title'
diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js
index af3d8ded..1c7a95af 100644
--- a/new-lamassu-admin/src/routing/routes.js
+++ b/new-lamassu-admin/src/routing/routes.js
@@ -2,18 +2,18 @@ import * as R from 'ramda'
 import React from 'react'
 import { Route, Redirect, Switch } from 'react-router-dom'
 
+import AuthRegister from 'src/pages/AuthRegister'
 import Commissions from 'src/pages/Commissions'
 import Funding from 'src/pages/Funding'
 import Locales from 'src/pages/Locales'
-import Logs from 'src/pages/Logs'
-import ServerLogs from 'src/pages/ServerLogs'
-import Transactions from 'src/pages/Transactions/Transactions'
-import Services from 'src/pages/Services/Services'
-import AuthRegister from 'src/pages/AuthRegister'
+import MachineLogs from 'src/pages/MachineLogs'
 import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo'
+import ServerLogs from 'src/pages/ServerLogs'
+import Services from 'src/pages/Services/Services'
+import Transactions from 'src/pages/Transactions/Transactions'
 
-import MachineStatus from '../pages/maintenance/MachineStatus'
 import Customers from '../pages/Customers'
+import MachineStatus from '../pages/maintenance/MachineStatus'
 
 const tree = [
   { key: 'transactions', label: 'Transactions', route: '/transactions' },
@@ -105,7 +105,7 @@ const Routes = () => (
     <Route path="/settings/locale" component={Locales} />
     <Route path="/settings/3rd-party-services" component={Services} />
     <Route path="/settings/operator-info" component={OperatorInfo} />
-    <Route path="/maintenance/logs" component={Logs} />
+    <Route path="/maintenance/logs" component={MachineLogs} />
     <Route path="/maintenance/funding" component={Funding} />
     <Route path="/maintenance/server-logs" component={ServerLogs} />
     <Route path="/transactions" component={Transactions} />