diff --git a/apps/documenteditor/mobile/app/controller/add/AddShape.js b/apps/documenteditor/mobile/app/controller/add/AddShape.js
index 39d7f81f5..61fcd7ba6 100644
--- a/apps/documenteditor/mobile/app/controller/add/AddShape.js
+++ b/apps/documenteditor/mobile/app/controller/add/AddShape.js
@@ -46,7 +46,7 @@ define([
 ], function (core) {
     'use strict';
 
-    DE.Controllers.AddShape = Backbone.Controller.extend((function() {
+    DE.Controllers.AddShape = Backbone.Controller.extend(_.extend((function() {
         var _styles = [];
 
         return {
@@ -228,5 +228,5 @@ define([
                 return _styles;
             }
         }
-    })());
+    })(), DE.Controllers.AddShape || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/controller/add/AddTable.js b/apps/documenteditor/mobile/app/controller/add/AddTable.js
index aa866a311..8bebc4978 100644
--- a/apps/documenteditor/mobile/app/controller/add/AddTable.js
+++ b/apps/documenteditor/mobile/app/controller/add/AddTable.js
@@ -47,7 +47,7 @@ define([
 ], function (core) {
     'use strict';
 
-    DE.Controllers.AddTable = Backbone.Controller.extend((function() {
+    DE.Controllers.AddTable = Backbone.Controller.extend(_.extend((function() {
         var _styles = [];
 
         return {
@@ -92,19 +92,19 @@ define([
                     if ($target) {
                         var picker;
                         var modal = uiApp.modal({
-                            title: 'Table Size',
+                            title: me.textTableSize,
                             text: '',
                             afterText:
                             '<div class="content-block">' +
                                 '<div class="row">' +
-                                    '<div class="col-50">Columns</div>' +
-                                    '<div class="col-50">Rows</div>' +
+                                    '<div class="col-50">' + me.textColumns + '</div>' +
+                                    '<div class="col-50">' + me.textRows + '</div>' +
                                 '</div>' +
                             '<div id="picker-table-size"></div>' +
                             '</div>',
                             buttons: [
                                 {
-                                    text: 'Cancel'
+                                    text: me.textCancel
                                 },
                                 {
                                     text: 'OK',
@@ -161,7 +161,12 @@ define([
 
                 Common.SharedSettings.set('tablestyles', _styles);
                 Common.NotificationCenter.trigger('tablestyles:load', _styles);
-            }
+            },
+
+            textTableSize: 'Table Size',
+            textColumns: 'Columns',
+            textRows: 'Rows',
+            textCancel: 'Cancel'
         }
-    })());
-});
+    })(), DE.Controllers.AddTable || {}))
+});
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/view/add/AddShape.js b/apps/documenteditor/mobile/app/view/add/AddShape.js
index 6617dc432..9fb31425c 100644
--- a/apps/documenteditor/mobile/app/view/add/AddShape.js
+++ b/apps/documenteditor/mobile/app/view/add/AddShape.js
@@ -49,7 +49,7 @@ define([
 ], function (addTemplate, $, _, Backbone) {
     'use strict';
 
-    DE.Views.AddShape = Backbone.View.extend((function() {
+    DE.Views.AddShape = Backbone.View.extend(_.extend((function() {
         // private
 
         return {
@@ -66,9 +66,7 @@ define([
             },
 
             initEvents: function () {
-                var me = this;
-
-                me.initControls();
+                this.initControls();
             },
 
             // Render layout
@@ -96,5 +94,5 @@ define([
                 //
             }
         }
-    })());
+    })(), DE.Views.AddShape || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/view/add/AddTable.js b/apps/documenteditor/mobile/app/view/add/AddTable.js
index 9545e5b41..d4c5b3bc4 100644
--- a/apps/documenteditor/mobile/app/view/add/AddTable.js
+++ b/apps/documenteditor/mobile/app/view/add/AddTable.js
@@ -48,7 +48,7 @@ define([
 ], function (addTemplate, $, _, Backbone) {
     'use strict';
 
-    DE.Views.AddTable = Backbone.View.extend((function() {
+    DE.Views.AddTable = Backbone.View.extend(_.extend((function() {
         // private
 
         return {
@@ -100,5 +100,5 @@ define([
                 //
             }
         }
-    })());
+    })(), DE.Views.AddTable || {}))
 });
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index af89f7d56..0eab8e57d 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -174,5 +174,10 @@
   "DE.Views.AddOther.textNextPage": "Next Page",
   "DE.Views.AddOther.textContPage": "Continuous Page",
   "DE.Views.AddOther.textEvenPage": "Even Page",
-  "DE.Views.AddOther.textOddPage": "Odd Page"
+  "DE.Views.AddOther.textOddPage": "Odd Page",
+
+  "DE.Controllers.AddTable.textTableSize": "Table Size",
+  "DE.Controllers.AddTable.textColumns": "Columns",
+  "DE.Controllers.AddTable.textRows": "Rows",
+  "DE.Controllers.AddTable.textCancel": "Cancel"
 }
\ No newline at end of file