diff --git a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template
index 19fce891c..a4988f40d 100644
--- a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template
@@ -21,7 +21,6 @@
             </tr>
         </table>
     </div>
-    <div class="padding-small"></div>
     <div class="inner-content">
         <table cols="2" style="width: 100%;">
             <tr>
diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
index f30583634..af45d6434 100644
--- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
@@ -24,7 +24,6 @@
             </tr>
         </table>
     </div>
-    <div class="padding-large"></div>
     <div class="inner-content">
         <table cols="2" style="width: 100%;">
             <tr>
diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
index 4064fba12..3b2f2b48f 100644
--- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
@@ -252,25 +252,27 @@ define([    'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
             if (props ){
                 this.spnWidth.setMaxValue(this.sizeMax.width);
                 this.spnHeight.setMaxValue(this.sizeMax.height);
-                this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Width()).toFixed(2), true);
-                this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Height()).toFixed(2), true);
+
+                this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);
+                this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getHeight()).toFixed(2), true);
+
+                if (props.asc_getHeight()>0)
+                    this._nRatio = props.asc_getWidth()/props.asc_getHeight();
 
                 var value = props.asc_getLockAspect();
                 this.btnRatio.toggle(value);
-                if (props.get_Height()>0)
-                    this._nRatio = props.get_Width()/props.get_Height();
 
                 this.cmbFromX.setValue('left');
                 this.cmbFromY.setValue('left');
 
-                /*if (props.get_Position()) {
-                    var Position = {X: props.get_Position().get_X(), Y: props.get_Position().get_Y()};
+                if (props.asc_getPosition()) {
+                    var Position = {X: props.asc_getPosition().get_X(), Y: props.asc_getPosition().get_Y()};
                     this.spnX.setValue((Position.X !== null && Position.X !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(Position.X) : '', true);
                     this.spnY.setValue((Position.Y !== null && Position.Y !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(Position.Y) : '', true);
-                } else {*/
+                } else {
                     this.spnX.setValue('', true);
                     this.spnY.setValue('', true);
-                /*}*/
+                }
 
                 var value = props.asc_getTitle();
                 this.inputAltTitle.setValue(value ? value : '');
@@ -283,7 +285,7 @@ define([    'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
         },
 
         getSettings: function() {
-            /*var Position = new Asc.CPosition();
+            var Position = new Asc.CPosition();
             if (this.spnX.getValue() !== '') {
                 var x = Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue());
                 if (this.cmbFromX.getValue() === 'center') {
@@ -298,7 +300,7 @@ define([    'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
                 }
                 Position.put_Y(y);
             }
-            this._changedProps.put_Position(Position);*/
+            this._changedProps.asc_putPosition(Position);
 
             if (this.isAltTitleChanged)
                 this._changedProps.asc_putTitle(this.inputAltTitle.getValue());
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index e52475887..128a8a1e9 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -625,11 +625,11 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                     this.radioFit.setDisabled(true);
                 }
 
-                this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Width()).toFixed(2), true);
-                this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Height()).toFixed(2), true);
+                this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);
+                this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getHeight()).toFixed(2), true);
 
-                if (props.get_Height()>0)
-                    this._nRatio = props.get_Width()/props.get_Height();
+                if (props.asc_getHeight()>0)
+                    this._nRatio = props.asc_getWidth()/props.asc_getHeight();
 
                 var value = props.asc_getLockAspect();
                 this.btnRatio.toggle(value);
@@ -637,14 +637,14 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                 this.cmbFromX.setValue('left');
                 this.cmbFromY.setValue('left');
 
-                /*if (props.get_Position()) {
-                    var Position = {X: props.get_Position().get_X(), Y: props.get_Position().get_Y()};
+                if (props.asc_getPosition()) {
+                    var Position = {X: props.asc_getPosition().get_X(), Y: props.asc_getPosition().get_Y()};
                     this.spnX.setValue((Position.X !== null && Position.X !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(Position.X) : '', true);
                     this.spnY.setValue((Position.Y !== null && Position.Y !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(Position.Y) : '', true);
-                } else {*/
-                this.spnX.setValue('', true);
-                this.spnY.setValue('', true);
-                /*}*/
+                } else {
+                    this.spnX.setValue('', true);
+                    this.spnY.setValue('', true);
+                }
 
                 this._setShapeDefaults(props);
 
@@ -702,7 +702,7 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
         },
 
         getSettings: function() {
-            /*var Position = new Asc.CPosition();
+            var Position = new Asc.CPosition();
             if (this.spnX.getValue() !== '') {
                 var x = Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue());
                 if (this.cmbFromX.getValue() === 'center') {
@@ -717,7 +717,7 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                 }
                 Position.put_Y(y);
             }
-            this._changedProps.put_Position(Position);*/
+            this._changedProps.asc_putPosition(Position);
 
             if (this.isAltTitleChanged)
                 this._changedProps.asc_putTitle(this.inputAltTitle.getValue());
diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
index 16c754ec2..2df4ed43a 100644
--- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
@@ -50,7 +50,7 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
             contentWidth: 280,
             height: 385,
             storageName: 'pe-table-settings-adv-category',
-            sizeMax: {width: 142.24, height: 142.24},
+            sizeMax: {width: 55.88, height: 55.88},
         },
 
         initialize : function(options) {
@@ -103,7 +103,7 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                 width: 100,
                 defaultUnit : "cm",
                 value: '3 cm',
-                maxValue: 142.24,
+                maxValue: 55.88,
                 minValue: 0
             });
             this.spnWidth.on('change', _.bind(function(field){
@@ -126,7 +126,7 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                 width: 100,
                 defaultUnit : "cm",
                 value: '3 cm',
-                maxValue: 142.24,
+                maxValue: 55.88,
                 minValue: 0
             });
             this.spnHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){
@@ -466,7 +466,7 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                 this._changedProps.put_FrameHeight(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue()));
             if (this.spnWidth.getValue()!=='')
                 this._changedProps.put_FrameWidth(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
-            //properties.asc_putLockAspect(this.btnRatio.pressed);
+            this._changedProps.put_FrameLockAspect(this.btnRatio.pressed);
 
             if (this.spnX.getValue() !== '') {
                 var x = Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue());
@@ -502,7 +502,8 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_FrameWidth()).toFixed(2), true);
                 this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_FrameHeight()).toFixed(2), true);
 
-                this.btnRatio.toggle(false); // to do
+                var value = props.get_FrameLockAspect();
+                this.btnRatio.toggle(value);
                 if (props.get_FrameHeight()>0)
                     this._nRatio = props.get_FrameWidth()/props.get_FrameHeight();