diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index dfb584697f..df078faf65 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -259,11 +259,9 @@
                 <div class="separator long"></div>
                 <div class="group small">
                     <div class="elset font-normal">
-                    <div class = "text">
                         <label id="animation-repeat"></label>
                         <span id="animation-spin-repeat" class="btn-slot text spinner" ></span>
                     </div>
-                    </div>
                     <div class="elset font-normal">
                          <span class="btn-slot text" id="animation-checkbox-rewind"></span>
                     </div>
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js
index 2ffe219ad9..5d0f6eff41 100644
--- a/apps/presentationeditor/main/app/view/Animation.js
+++ b/apps/presentationeditor/main/app/view/Animation.js
@@ -215,8 +215,10 @@ define([
                     iconCls: 'toolbar__icon transition-fade',
                     lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview],
                     dataHint: '1',
-                    dataHintDirection: 'left',
-                    dataHintOffset: 'medium'
+                    /*dataHintDirection: 'left',
+                    dataHintOffset: 'medium'*/
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'small'
                 });
                 this.lockedControls.push(this.btnPreview);
 
@@ -352,8 +354,8 @@ define([
                     defaultUnit: '',
                     lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
                     dataHint: '1',
-                    dataHintDirection: 'bottom',
-                    dataHintOffset: 'big'
+                    dataHintDirection: 'top',
+                    dataHintOffset: 'small'
                 });
                 this.lockedControls.push(this.numRepeat);
 
@@ -481,8 +483,10 @@ define([
 
             setMenuParameters: function (effectId, effectGroup, option)
             {
+                var arrEffectOptions;
                 var effect = _.findWhere(this.allEffects, {group: effectGroup, value: effectId});
-                var arrEffectOptions = Common.define.effectData.getEffectOptionsData(effect.group, effect.value);
+                if(effect)
+                    arrEffectOptions = Common.define.effectData.getEffectOptionsData(effect.group, effect.value);
                 if(!arrEffectOptions) {
                     this.btnParameters.menu.removeAll();
                     this._effectId = effectId
diff --git a/apps/presentationeditor/main/app/view/AnimationDialog.js b/apps/presentationeditor/main/app/view/AnimationDialog.js
index 1b06283fe7..f0f0391671 100644
--- a/apps/presentationeditor/main/app/view/AnimationDialog.js
+++ b/apps/presentationeditor/main/app/view/AnimationDialog.js
@@ -73,9 +73,15 @@ define([
             if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE) && (this.options.activeEffect !== AscFormat.ANIM_PRESET_MULTIPLE)){
                 this._state.activeEffect = this.options.activeEffect;
                 this._state.activeGroupValue = this.options.groupValue;
-                this._state.activeGroup = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue}).id;
-                var itemEffect = _.findWhere(this.allEffects,{group: this._state.activeGroup, value: this._state.activeEffect});
-                this.activeLevel = itemEffect.level;
+                var group = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue})
+                this._state.activeGroup = group.id;
+                var itemEffect = _.findWhere(this.allEffects, {
+                    group: this._state.activeGroup,
+                    value: this._state.activeEffect
+                });
+                if(itemEffect)
+                    this.activeLevel = itemEffect.level;
+
             }
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },
@@ -154,7 +160,9 @@ define([
         fillEffect: function () {
             var arr = _.where(this.allEffects, {group: this._state.activeGroup, level: this.activeLevel });
             this.lstEffectList.store.reset(arr);
-            var  item = (this._state.activeEffect != undefined)?this.lstEffectList.store.findWhere({value: this._state.activeEffect}):this.lstEffectList.store.at(0);
+            var  item = this.lstEffectList.store.findWhere({value: this._state.activeEffect});
+            if(!item)
+                item = this.lstEffectList.store.at(0);
             this.lstEffectList.selectRecord(item);
             this._state.activeEffect = item.get('value');
         },