6 files changed, 16 insertions, 9 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 9ae7fa761..d4b3e794d 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -18,7 +18,10 @@ Ext.define('Traccar.controller.Root', {
     extend: 'Ext.app.Controller',
     
     requires: [
-        'Traccar.LoginManager'
+        'Traccar.LoginManager',
+        'Traccar.view.login.Login',
+        'Traccar.view.Main',
+        'Traccar.view.MainMobile'
     ],
 
     init: function() {
@@ -46,7 +49,7 @@ Ext.define('Traccar.controller.Root', {
         if (success) {
             this.loadApp();
         } else {
-            this.login = Ext.create('Traccar.view.login.Login', {
+            this.login = Ext.create('widget.login', {
                 listeners: {
                     scope: this,
                     login: 'onLogin'
@@ -65,9 +68,9 @@ Ext.define('Traccar.controller.Root', {
         Ext.getStore('Devices').load();
         Ext.getBody().empty();
         if (this.isPhone) {
-            Ext.create('Traccar.view.MainMobile');
+            Ext.create('widget.mainMobile');
         } else {
-            Ext.create('Traccar.view.Main');
+            Ext.create('widget.main');
         }
     }
 });
diff --git a/web/app/view/device/Device.js b/web/app/view/Device.js
index d77f405bd..de2c7ed4c 100644
--- a/web/app/view/device/Device.js
+++ b/web/app/view/Device.js
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-Ext.define('Traccar.view.device.Device', {
+Ext.define('Traccar.view.Device', {
     extend: 'Ext.grid.Panel',
     xtype: 'deviceView',
 
     requires: [
-        'Traccar.view.device.DeviceController'
+        'Traccar.view.DeviceController'
     ],
     
     controller: 'device',
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/DeviceController.js
index e2e82448d..e315d6f8d 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/DeviceController.js
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-Ext.define('Traccar.view.device.DeviceController', {
+Ext.define('Traccar.view.DeviceController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.device',
     
     requires: [
         'Traccar.view.CommandDialog',
+        'Traccar.view.DeviceDialog',
         'Traccar.view.user.UserDialog',
         'Traccar.view.user.User',
         'Traccar.view.login.LoginController'
diff --git a/web/app/view/Main.js b/web/app/view/Main.js
index 814e5c1d5..958042542 100644
--- a/web/app/view/Main.js
+++ b/web/app/view/Main.js
@@ -16,9 +16,10 @@
 
 Ext.define('Traccar.view.Main', {
     extend: 'Ext.container.Viewport',
+    alias: 'widget.main',
 
     requires: [
-        'Traccar.view.device.Device',
+        'Traccar.view.Device',
         'Traccar.view.state.State',
         'Traccar.view.report.Report',
         'Traccar.view.map.Map'
diff --git a/web/app/view/MainMobile.js b/web/app/view/MainMobile.js
index dc39a037c..310f3a872 100644
--- a/web/app/view/MainMobile.js
+++ b/web/app/view/MainMobile.js
@@ -16,9 +16,10 @@
 
 Ext.define('Traccar.view.MainMobile', {
     extend: 'Ext.container.Viewport',
+    alias: 'widget.mainMobile',
 
     requires: [
-        'Traccar.view.device.Device',
+        'Traccar.view.Device',
         'Traccar.view.state.State',
         'Traccar.view.map.Map'
     ],
diff --git a/web/app/view/login/Login.js b/web/app/view/login/Login.js
index fc1e749d1..a2d53fdf1 100644
--- a/web/app/view/login/Login.js
+++ b/web/app/view/login/Login.js
@@ -16,6 +16,7 @@
 
 Ext.define('Traccar.view.login.Login', {
     extend: 'Ext.window.Window',
+    alias: 'widget.login',
     
     requires: [
         'Traccar.view.login.LoginController'