diff --git a/modules/backend/assets/css/controls.css b/modules/backend/assets/css/controls.css
index 4c38f76b1..00948a12d 100644
--- a/modules/backend/assets/css/controls.css
+++ b/modules/backend/assets/css/controls.css
@@ -354,6 +354,7 @@ table.table.data tr.list-tree-level-25 td.list-cell-index-1{padding-left:275px}
 .loading-indicator-container .loading-indicator > div{position:absolute;top:50%;margin-top:-0.65em}
 html.cssanimations .loading-indicator > span{background-image:url(../images/loading-indicator-transparent.svg);background-size:35px 35px;background-position:50% 50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}
 html.cssanimations .loading-indicator.is-opaque > span,html.cssanimations .loading-indicator-container.is-opaque .loading-indicator > span{background-image:url(../images/loading-indicator.svg)}
+.loading-indicator-container.size-small{min-height:20px}
 .loading-indicator.size-small,.loading-indicator-container.size-small .loading-indicator{padding:16px 16px 16px 30px;font-size:11px}
 .loading-indicator.size-small > span,.loading-indicator-container.size-small .loading-indicator > span{height:20px;width:20px;margin-top:-10px}
 html.cssanimations .loading-indicator.size-small > span,html.cssanimations .loading-indicator-container.size-small .loading-indicator > span{background-size:20px 20px}
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index cd9e5315b..4b6ed9a32 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -29,7 +29,7 @@ return true})
 function backendUrl(url){if(typeof backendBasePath==='undefined'||!backendBasePath)
 return url;if(url.substr(0,1)=='/')
 url=url.substr(1);return backendBasePath+url;}
-LockManager=function(){var o={locks:{},set:function(name){o.locks[name]=true;},get:function(name){return(o.locks[name]);},remove:function(name){o.locks[name]=null;}};return o;};lockManager=new LockManager();AssetManager=function(){var o={load:function(collection,callback){var jsList=(collection.js)?collection.js:[],cssList=(collection.css)?collection.css:[],imgList=(collection.img)?collection.img:[]
+AssetManager=function(){var o={load:function(collection,callback){var jsList=(collection.js)?collection.js:[],cssList=(collection.css)?collection.css:[],imgList=(collection.img)?collection.img:[]
 jsList=$.grep(jsList,function(item){return $('head script[src="'+item+'"]').length==0})
 cssList=$.grep(cssList,function(item){return $('head link[href="'+item+'"]').length==0})
 var cssCounter=0,jsLoaded=false,imgLoaded=false
@@ -296,7 +296,7 @@ if(!data)$this.data('oc.toolbar',(data=new Toolbar(this,options)))})}
 $.fn.toolbar.Constructor=Toolbar
 $.fn.toolbar.noConflict=function(){$.fn.toolbar=old
 return this}
-$(document).on('render',function(){$('[data-control=toolbar]').toolbar()})}(window.jQuery);+function($){"use strict";var VerticalMenu=function(element,toggle,options){this.body=$('body')
+$(document).on('render',function(){$('[data-control=toolbar]').toolbar()})}(window.jQuery);(function($){$(document).render(function(){$('[data-toggle="tooltip"]').tooltip()})})(jQuery);+function($){"use strict";var VerticalMenu=function(element,toggle,options){this.body=$('body')
 this.toggle=$(toggle)
 this.options=options||{}
 this.options=$.extend({},VerticalMenu.DEFAULTS,this.options)
@@ -339,7 +339,7 @@ $.fn.verticalMenu.noConflict=function(){$.fn.verticalMenu=old
 return this}}(window.jQuery);(function($){$(window).load(function(){$('nav.navbar').each(function(){var
 navbar=$(this),nav=$('ul.nav',navbar)
 nav.verticalMenu($('a.menu-toggle',navbar))
-$('[data-toggle="tooltip"]',navbar).tooltip({'container':'body'})
+$('li.with-tooltip > a',navbar).tooltip({container:'body',placement:'bottom'})
 $('.layout-cell.width-fix',navbar).one('oc.widthFixed',function(){var dragScroll=$('[data-control=toolbar]',navbar).data('oc.dragScroll')
 if(dragScroll)
 dragScroll.goToElement($('ul.nav > li.active',navbar),undefined,{'duration':0})})})})})(jQuery);+function($){"use strict";if($.oc===undefined)
@@ -997,7 +997,7 @@ this.hide()
 var indicator=$('<div class="loading-indicator"></div>')
 indicator.append($('<div></div>').text(this.options.text))
 indicator.append($('<span></span>'))
-if(this.options.opaque!==undefined){indicator.addClass('is-opaque')}
+if(this.options.opaque!==undefined&&this.options.opaque){indicator.addClass('is-opaque')}
 this.$el.prepend(indicator)
 this.$el.addClass('in-progress')
 this.tally++}
@@ -1456,7 +1456,7 @@ Inspector.prototype.init=function(){if(!this.config||this.config.length==0)
 return
 var self=this,fieldsConfig=this.preprocessConfig(),data={title:this.title?this.title:this.$el.data('inspector-title'),description:this.description?this.description:this.$el.data('inspector-description'),properties:fieldsConfig.properties,editor:function(){return function(text,render){if(this.itemType=='property')
 return self.renderEditor(this,render)}},info:function(){return function(text,render){if(this.description!==undefined&&this.description!=null)
-return render('<span data-toggle="tooltip" title="{{description}}" class="info oc-icon-info"></span>',this)}},propFormat:function(){return function(text,render){return'prop-'+render(text).replace('.','-')}},colspan:function(){return function(text,render){return this.itemType=='group'?'colspan="2"':null}},tableClass:function(){return function(text,render){return fieldsConfig.hasGroups?'has-groups':null}},cellClass:function(){return function(text,render){var result=this.itemType+((this.itemType=='property'&&this.groupIndex!==undefined)?' grouped':'')
+return render('<span title="{{description}}" class="info oc-icon-info with-tooltip"></span>',this)}},propFormat:function(){return function(text,render){return'prop-'+render(text).replace('.','-')}},colspan:function(){return function(text,render){return this.itemType=='group'?'colspan="2"':null}},tableClass:function(){return function(text,render){return fieldsConfig.hasGroups?'has-groups':null}},cellClass:function(){return function(text,render){var result=this.itemType+((this.itemType=='property'&&this.groupIndex!==undefined)?' grouped':'')
 if(this.itemType=='property'&&this.groupIndex!==undefined)
 result+=self.groupExpanded(this.group)?' expanded':' collapsed'
 if(this.itemType=='property'&&!this.showExternalParam)
@@ -1488,7 +1488,7 @@ if(self.$el.closest('[data-inspector-external-parameters]').length>0)
 self.initExternalParameterEditor(self.$el.data('oc.popover').$container)
 $.each(self.editors,function(){if(this.init!==undefined)
 this.init()})
-$('[data-toggle=tooltip]',self.$el.data('oc.popover').$container).tooltip({placement:'auto right',container:'body',delay:500})
+$('.with-tooltip',self.$el.data('oc.popover').$container).tooltip({placement:'auto right',container:'body',delay:500})
 var $container=self.$el.data('oc.popover').$container
 $container.on('click','tr.group',function(){self.toggleGroup($('a.expandControl',this),$container)
 return false})
@@ -1670,7 +1670,7 @@ e.preventDefault()
 var self=this
 setTimeout(function(){self.focus()},0)
 return false})
-$('[data-toggle=tooltip]',this.$el.data('oc.popover').$container).tooltip('hide')
+$('.with-tooltip',this.$el.data('oc.popover').$container).tooltip('hide')
 if(!e.isDefaultPrevented()){$.each(this.editors,function(){if(this.cleanup)
 this.cleanup()})}}
 Inspector.prototype.editorExternalPropertyEnabled=function(editor){var $container=this.$el.data('inspector-container'),$cell=$('#'+editor.inspectorCellId,$container),$extPropEditorContainer=$cell.find('.external-param-editor-container')
@@ -1774,7 +1774,7 @@ if(this.fieldDef.placeholder!==undefined)
 options.placeholder=this.fieldDef.placeholder
 $(this.selector).select2(options)}
 if(this.dynamicOptions){if(!Modernizr.touch){this.indicatorContainer=$('.select2-container',$(this.selector).closest('td'))
-this.indicatorContainer.addClass('loading-indicator-container').addClass('size-small').addClass('transparent')}
+this.indicatorContainer.addClass('loading-indicator-container').addClass('size-small')}
 this.loadOptions(true)}
 if(this.fieldDef.depends)
 this.inspector.$el.on('propertyChanged.oc.Inspector',$.proxy(this.onDependencyChanged,this))}
@@ -1788,7 +1788,7 @@ InspectorEditorDropdown.prototype.getDependencyValues=function(){var dependencyV
 $.each(this.fieldDef.depends,function(index,masterProperty){dependencyValues+=masterProperty+':'+self.inspector.readProperty(masterProperty)+'-'})
 return dependencyValues}
 InspectorEditorDropdown.prototype.showLoadingIndicator=function(){if(!Modernizr.touch)
-this.indicatorContainer.loadIndicator({'opaque':true})}
+this.indicatorContainer.loadIndicator()}
 InspectorEditorDropdown.prototype.hideLoadingIndicator=function(){if(!Modernizr.touch)
 this.indicatorContainer.loadIndicator('hide')}
 InspectorEditorDropdown.prototype.loadOptions=function(initialization){var $form=$(this.selector).closest('form'),data=this.inspector.propertyValues,$select=$(this.selector),currentValue=this.inspector.readProperty(this.fieldDef.property,true),self=this
diff --git a/modules/backend/assets/js/october.inspector.js b/modules/backend/assets/js/october.inspector.js
index 058c207ea..672833b48 100644
--- a/modules/backend/assets/js/october.inspector.js
+++ b/modules/backend/assets/js/october.inspector.js
@@ -185,7 +185,7 @@
                 info: function() {
                     return function(text, render) {
                         if (this.description !== undefined && this.description != null)
-                            return render('<span data-toggle="tooltip" title="{{description}}" class="info oc-icon-info"></span>', this)
+                            return render('<span title="{{description}}" class="info oc-icon-info with-tooltip"></span>', this)
                     }
                 },
                 propFormat: function() {
@@ -290,7 +290,8 @@
                     this.init()
             })
 
-            $('[data-toggle=tooltip]', self.$el.data('oc.popover').$container).tooltip({placement: 'auto right', container: 'body', delay: 500})
+            $('.with-tooltip', self.$el.data('oc.popover').$container)
+                .tooltip({ placement: 'auto right', container: 'body', delay: 500 })
 
             var $container = self.$el.data('oc.popover').$container
             $container.on('click', 'tr.group', function(){
@@ -764,7 +765,7 @@
             return false
         })
 
-        $('[data-toggle=tooltip]', this.$el.data('oc.popover').$container).tooltip('hide')
+        $('.with-tooltip', this.$el.data('oc.popover').$container).tooltip('hide')
 
         if (!e.isDefaultPrevented())  {
             $.each(this.editors, function() {
@@ -1044,7 +1045,7 @@
         if (this.dynamicOptions) {
             if (!Modernizr.touch) {
                 this.indicatorContainer = $('.select2-container', $(this.selector).closest('td'))
-                this.indicatorContainer.addClass('loading-indicator-container').addClass('size-small').addClass('transparent')
+                this.indicatorContainer.addClass('loading-indicator-container').addClass('size-small')
             }
 
             this.loadOptions(true)
@@ -1082,7 +1083,7 @@
 
     InspectorEditorDropdown.prototype.showLoadingIndicator = function() {
         if (!Modernizr.touch)
-            this.indicatorContainer.loadIndicator({'opaque': true})
+            this.indicatorContainer.loadIndicator()
     }
 
     InspectorEditorDropdown.prototype.hideLoadingIndicator = function() {
diff --git a/modules/backend/assets/js/october.js b/modules/backend/assets/js/october.js
index bce37d09b..062303104 100644
--- a/modules/backend/assets/js/october.js
+++ b/modules/backend/assets/js/october.js
@@ -13,6 +13,7 @@
 =require october.dragscroll.js
 =require october.dragvalue.js
 =require october.toolbar.js
+=require october.tooltip.js
 =require october.verticalmenu.js
 =require october.navbar.js
 =require october.sidenav.js
diff --git a/modules/backend/assets/js/october.loadindicator.js b/modules/backend/assets/js/october.loadindicator.js
index f20f36108..3d45d8c11 100644
--- a/modules/backend/assets/js/october.loadindicator.js
+++ b/modules/backend/assets/js/october.loadindicator.js
@@ -11,8 +11,8 @@
  *
  * JavaScript API:
  *
- * $('#buttons').loadIndicator({text: 'Saving...', opaque: true}) - display the indicator in a solid (opaque) state
- * $('#buttons').loadIndicator({text: 'Saving...'}) - display the indicator in a transparent state
+ * $('#buttons').loadIndicator({ text: 'Saving...', opaque: true }) - display the indicator in a solid (opaque) state
+ * $('#buttons').loadIndicator({ text: 'Saving...' }) - display the indicator in a transparent state
  * $('#buttons').loadIndicator('hide') - display the indicator
  */
 +function ($) { "use strict";
@@ -44,7 +44,7 @@
         var indicator = $('<div class="loading-indicator"></div>')
         indicator.append($('<div></div>').text(this.options.text))
         indicator.append($('<span></span>'))
-        if (this.options.opaque !== undefined) {
+        if (this.options.opaque !== undefined && this.options.opaque) {
             indicator.addClass('is-opaque')
         }
 
diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/october.navbar.js
index 71c9c7b41..506f431b9 100644
--- a/modules/backend/assets/js/october.navbar.js
+++ b/modules/backend/assets/js/october.navbar.js
@@ -18,8 +18,9 @@
 
             nav.verticalMenu($('a.menu-toggle', navbar))
 
-            $('[data-toggle="tooltip"]', navbar).tooltip({
-                'container': 'body'
+            $('li.with-tooltip > a', navbar).tooltip({
+                container: 'body',
+                placement: 'bottom'
             })
 
             $('.layout-cell.width-fix', navbar).one('oc.widthFixed', function(){
diff --git a/modules/backend/assets/js/october.tooltip.js b/modules/backend/assets/js/october.tooltip.js
new file mode 100644
index 000000000..c48f21920
--- /dev/null
+++ b/modules/backend/assets/js/october.tooltip.js
@@ -0,0 +1,21 @@
+/*
+ * Implement the tooltip control automatically
+ *
+ * Usage:
+ *
+ *   <a
+ *       href="javascript:;"
+ *       data-toggle="tooltip"
+ *       data-placement="left"
+ *       title="Tooltip content">
+ *       Some link
+ *   </a>
+ */
+
+(function($){
+
+    $(document).render(function(){
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/backend/assets/js/october.utils.js b/modules/backend/assets/js/october.utils.js
index 3d40fa94f..ee2c6ffaa 100644
--- a/modules/backend/assets/js/october.utils.js
+++ b/modules/backend/assets/js/october.utils.js
@@ -53,33 +53,6 @@ function backendUrl(url) {
     return backendBasePath + url;
 }
 
-/*
- * Lock Manager
- */
-
-LockManager = function() {
-
-    var o = {
-        locks: {},
-
-        set: function(name) {
-            o.locks[name] = true;
-        },
-        
-        get: function(name) {
-            return (o.locks[name]);
-        },
-
-        remove: function(name) {
-            o.locks[name] = null;
-        }
-    };
-
-    return o;
-};
-
-lockManager = new LockManager();
-
 /*
  * Asset Manager
  *
diff --git a/modules/backend/assets/less/controls/loadindicator.less b/modules/backend/assets/less/controls/loadindicator.less
index 2147be270..a0ebd5fd9 100644
--- a/modules/backend/assets/less/controls/loadindicator.less
+++ b/modules/backend/assets/less/controls/loadindicator.less
@@ -61,6 +61,10 @@ html.cssanimations {
 
 // Sizes
 
+.loading-indicator-container.size-small {
+    min-height: 20px;
+}
+
 .loading-indicator.size-small,
 .loading-indicator-container.size-small .loading-indicator {
     padding: 16px 16px 16px 30px;
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index 9cf5b04d7..d50f12d86 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -90,8 +90,11 @@ class FormController extends ControllerBehavior
      * @param Model $model
      * @return void
      */
-    public function initForm($model)
+    public function initForm($model, $context = null)
     {
+        if ($context !== null)
+            $this->context = $context;
+
         $context = $this->formGetContext();
 
         /*
diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index 5b0f241fe..e696b38c2 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "Das Partial ':name' wurde nicht gefunden.",
+        'not_found_name' => "Das Partial ':name' wurde nicht gefunden.",
     ],
     'account' => [
         'sign_out' => 'Abmelden',
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index d761c5d8a..88c01e4bf 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -21,7 +21,7 @@ return [
         ]
     ],
     'partial' => [
-        'not_found' => "The partial ':name' is not found."
+        'not_found_name' => "The partial ':name' is not found."
     ],
     'account' => [
         'sign_out' => 'Sign out',
diff --git a/modules/backend/lang/es-ar/lang.php b/modules/backend/lang/es-ar/lang.php
index c940312e9..e8e401b95 100644
--- a/modules/backend/lang/es-ar/lang.php
+++ b/modules/backend/lang/es-ar/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "El parcial ':name' no se encuentra.",
+        'not_found_name' => "El parcial ':name' no se encuentra.",
     ],
     'account' => [
         'sign_out' => 'Salir',
diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php
index e41fd5cb2..9223020c1 100644
--- a/modules/backend/lang/fa/lang.php
+++ b/modules/backend/lang/fa/lang.php
@@ -21,7 +21,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "بخشی با نام ':name' یافت نشد.",
+        'not_found_name' => "بخشی با نام ':name' یافت نشد.",
     ],
     'account' => [
         'sign_out'             => 'خروج',
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index a2f57a87d..9257c56ca 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "Le partial ':name' est introuvable.",
+        'not_found_name' => "Le partial ':name' est introuvable.",
     ],
     'account' => [
         'sign_out' => 'Déconnexion',
diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php
index 8c8648222..c1dbc8324 100644
--- a/modules/backend/lang/hu/lang.php
+++ b/modules/backend/lang/hu/lang.php
@@ -21,7 +21,7 @@ return [
         ]
     ],
     'partial' => [
-        'not_found' => "A(z) ':name' részlap nem található."
+        'not_found_name' => "A(z) ':name' részlap nem található."
     ],
     'account' => [
         'sign_out' => 'Kijelentkezés',
diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php
index c339aae68..caa35a56f 100644
--- a/modules/backend/lang/it/lang.php
+++ b/modules/backend/lang/it/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "La vista parziale ':name' non è stata trovata.",
+        'not_found_name' => "La vista parziale ':name' non è stata trovata.",
     ],
     'account' => [
         'sign_out' => 'Esci',
diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php
index d9514cd5c..bce7b076d 100644
--- a/modules/backend/lang/ja/lang.php
+++ b/modules/backend/lang/ja/lang.php
@@ -21,7 +21,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "':name'パーシャルは見つかりません。",
+        'not_found_name' => "':name'パーシャルは見つかりません。",
     ],
     'account' => [
         'sign_out' => 'ログアウト',
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index c65889365..8bbe72e48 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "Het sjabloon (partial) ':name' is niet gevonden.",
+        'not_found_name' => "Het sjabloon (partial) ':name' is niet gevonden.",
     ],
     'account' => [
         'sign_out' => 'Uitloggen',
diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php
index 912d46d8c..36a372cfd 100644
--- a/modules/backend/lang/pl/lang.php
+++ b/modules/backend/lang/pl/lang.php
@@ -21,7 +21,7 @@ return [
         ]
     ],
     'partial' => [
-        'not_found' => "Blok ':name' nie zostały odnaleziony."
+        'not_found_name' => "Blok ':name' nie zostały odnaleziony."
     ],
     'account' => [
         'sign_out' => 'Wyloguj',
diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php
index ac035b579..4bd9a0ebb 100644
--- a/modules/backend/lang/pt-br/lang.php
+++ b/modules/backend/lang/pt-br/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "O bloco ':name' não foi encontrado.",
+        'not_found_name' => "O bloco ':name' não foi encontrado.",
     ],
     'account' => [
         'sign_out' => 'Sair',
diff --git a/modules/backend/lang/ro/lang.php b/modules/backend/lang/ro/lang.php
index 4e8440600..dede7394d 100644
--- a/modules/backend/lang/ro/lang.php
+++ b/modules/backend/lang/ro/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "Partialul ':name' nu a fost gasit.",
+        'not_found_name' => "Partialul ':name' nu a fost gasit.",
     ],
     'account' => [
         'sign_out' => 'Deconectare',
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index e2e85bd93..b48dcec40 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -21,7 +21,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "Не удалось найти шаблон (partial) с именем :name.",
+        'not_found_name' => "Не удалось найти шаблон (partial) с именем :name.",
     ],
     'account' => [
         'sign_out' => 'Выйти',
diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index 968916ef5..e59557321 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -18,7 +18,7 @@ return [
         ],
     ],
     'partial' => [
-        'not_found' => "En partial med namn ':name' kunde ej hittas",
+        'not_found_name' => "En partial med namn ':name' kunde ej hittas",
     ],
     'account' => [
         'sign_out' => 'Logga ut',
diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index 4bc477af3..35e226109 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -21,7 +21,7 @@ return [
         ]
     ],
     'partial' => [
-        'not_found' => "':name' bölümü bulunamadı."
+        'not_found_name' => "':name' bölümü bulunamadı."
     ],
     'account' => [
         'sign_out' => 'Çıkış',
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index b737fc000..1081882ae 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -52,12 +52,10 @@
                     </ul>
                 </div>
             </li>
-            <li class="icon preview">
+            <li class="icon preview with-tooltip">
                 <a
                     href="<?= URL::to('/') ?>"
                     target="_blank"
-                    data-toggle="tooltip"
-                    data-placement="bottom"
                     title="<?= e(trans('backend::lang.tooltips.preview_website')) ?>">
                     <i class="icon-crosshairs"></i>
                 </a>
diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php
index 8649b9357..1376cb7e1 100644
--- a/modules/backend/traits/InspectableContainer.php
+++ b/modules/backend/traits/InspectableContainer.php
@@ -45,7 +45,7 @@ trait InspectableContainer
          * Convert to array to retain the sort order in JavaScript
          */
         $optionsArray = [];
-        foreach ($options as $value => $title) {
+        foreach ((array) $options as $value => $title) {
             $optionsArray[] = ['value' => $value, 'title' => $title];
         }
 
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index e4df9a260..60600a29f 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -238,7 +238,11 @@ class Controller
 
         $controller = new static($theme);
         $controller->getRouter()->setParameters($parameters);
-        $page = Page::load($theme, $pageFile);
+
+        if (($page = Page::load($theme, $pageFile)) === null) {
+            throw new CmsException(Lang::get('cms::lang.page.not_found_name', ['name'=>$pageFile]));
+        }
+
         return $controller->runPage($page, false);
     }
 
@@ -259,7 +263,7 @@ class Controller
             $layout = Layout::initFallback($this->theme);
         }
         elseif (($layout = Layout::loadCached($this->theme, $page->layout)) === null) {
-            throw new CmsException(Lang::get('cms::lang.layout.not_found', ['name'=>$page->layout]));
+            throw new CmsException(Lang::get('cms::lang.layout.not_found_name', ['name'=>$page->layout]));
         }
 
         $this->layout = $layout;
@@ -729,7 +733,7 @@ class Controller
                 }
                 elseif (($componentObj = $this->findComponentByPartial($partialName)) === null) {
                     if ($throwException) {
-                        throw new CmsException(Lang::get('cms::lang.partial.not_found', ['name'=>$partialName]));
+                        throw new CmsException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$partialName]));
                     }
                     else {
                         return false;
@@ -770,7 +774,7 @@ class Controller
 
             if ($partial === null) {
                 if ($throwException) {
-                    throw new CmsException(Lang::get('cms::lang.partial.not_found', ['name'=>$name]));
+                    throw new CmsException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$name]));
                 }
                 else {
                     return false;
@@ -788,7 +792,7 @@ class Controller
              */
             if (($partial = Partial::loadCached($this->theme, $name)) === null) {
                 if ($throwException) {
-                    throw new CmsException(Lang::get('cms::lang.partial.not_found', ['name'=>$name]));
+                    throw new CmsException(Lang::get('cms::lang.partial.not_found_name', ['name'=>$name]));
                 }
                 else {
                     return false;
@@ -882,7 +886,7 @@ class Controller
          * Load content from theme
          */
         elseif (($content = Content::loadCached($this->theme, $name)) === null) {
-            throw new CmsException(Lang::get('cms::lang.content.not_found', ['name'=>$name]));
+            throw new CmsException(Lang::get('cms::lang.content.not_found_name', ['name'=>$name]));
         }
 
         $fileContent = $content->parsedMarkup;
diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index 24ee467eb..93291872b 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -40,7 +40,7 @@ return [
         'no_layout' => '-- Kein Layout --'
     ],
     'layout' => [
-        'not_found' => "Das Layout ':name' wurde nicht gefunden",
+        'not_found_name' => "Das Layout ':name' wurde nicht gefunden",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Keine Layouts gefunden',
         'new' => 'Neues Layout',
@@ -48,8 +48,8 @@ return [
         'delete_confirm_single' => 'Wollen Sie das ausgewählte Layout wirklich löschen?'
     ],
     'partial' => [
+        'not_found_name' => "Das Partial ':name' wurde nicht gefunden.",
         'invalid_name' => "Ungültiger Partial-Name: :name.",
-        'not_found' => "Das Partial ':name' wurde nicht gefunden.",
         'menu_label' => 'Partials',
         'no_list_records' => 'Keine Partials gefunden',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Partials wirklich löschen?',
@@ -57,7 +57,7 @@ return [
         'new' => 'Neues Partial'
     ],
     'content' => [
-        'not_found' => "Die Inhaltsdatei ':name' wurde nicht gefundne.",
+        'not_found_name' => "Die Inhaltsdatei ':name' wurde nicht gefundne.",
         'menu_label' => 'Inhalt',
         'no_list_records' => 'Keine Inhaltsdateien gefunden',
         'delete_confirm_multiple' => 'Wollen Sie die ausgewählten Inhalte und Verzeichnisse wirklich löschen?',
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index a05af3a63..6c0b791b5 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -36,6 +36,7 @@ return [
         'is_enabled_comment' => 'When activated website visitors will see the page chosen below.'
     ],
     'page' => [
+        'not_found_name' => "The page ':name' is not found",
         'not_found' => [
             'label' => 'Page not found',
             'help' => 'The requested page cannot be found.'
@@ -54,7 +55,7 @@ return [
         'no_layout' => '-- no layout --'
     ],
     'layout' => [
-        'not_found' => "The layout ':name' is not found",
+        'not_found_name' => "The layout ':name' is not found",
         'menu_label' => 'Layouts',
         'unsaved_label' => 'Unsaved layout(s)',
         'no_list_records' => 'No layouts found',
@@ -63,8 +64,8 @@ return [
         'delete_confirm_single' => 'Do you really want delete this layout?'
     ],
     'partial' => [
+        'not_found_name' => "The partial ':name' is not found.",
         'invalid_name' => 'Invalid partial name: :name.',
-        'not_found' => "The partial ':name' is not found.",
         'menu_label' => 'Partials',
         'unsaved_label' => 'Unsaved partial(s)',
         'no_list_records' => 'No partials found',
@@ -73,7 +74,7 @@ return [
         'new' => 'New partial'
     ],
     'content' => [
-        'not_found' => "The content file ':name' is not found.",
+        'not_found_name' => "The content file ':name' is not found.",
         'menu_label' => 'Content',
         'unsaved_label' => 'Unsaved content',
         'no_list_records' => 'No content files found',
diff --git a/modules/cms/lang/es-ar/lang.php b/modules/cms/lang/es-ar/lang.php
index 5f49d0c3f..ff24128f5 100644
--- a/modules/cms/lang/es-ar/lang.php
+++ b/modules/cms/lang/es-ar/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- ninguna disposición --'
     ],
     'layout' => [
-        'not_found' => "El diseño ':name' no se encuentra",
+        'not_found_name' => "El diseño ':name' no se encuentra",
         'menu_label' => 'Diseños',
         'no_list_records' => 'No se ecnontraron diseños',
         'new' => 'Nuevo diseño',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Realmente quiere borrar este diseño?'
     ],
     'partial' => [
+        'not_found_name' => "El nombre parcial ':name' no se encuentra.",
         'invalid_name' => "Nombre parcial inválido: :name.",
-        'not_found' => "El nombre parcial ':name' no se encuentra.",
         'menu_label' => 'Parciales',
         'no_list_records' => 'No se encontraron parciales',
         'delete_confirm_multiple' => 'Realmente quiere borrar los parciales seleccionados?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Nuevo parcial'
     ],
     'content' => [
-        'not_found' => "El contenido del archivo ':name' no se encuentra.",
+        'not_found_name' => "El contenido del archivo ':name' no se encuentra.",
         'menu_label' => 'Contenido',
         'no_list_records' => 'No se encuentra el conteinod de los archivos',
         'delete_confirm_multiple' => 'Realmente desea borrar los contenidos seleccionados de los archivos o directorios?',
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index d419840b2..1cae409f4 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- بدون طرح بندی --'
     ],
     'layout' => [
-        'not_found' => "طرح بندی ی ':name' یافت نشد",
+        'not_found_name' => "طرح بندی ی ':name' یافت نشد",
         'menu_label' => 'طرح بندی ها',
         'no_list_records' => 'طرحبندی یافت نشد',
         'new' => 'طرح بندی جدید',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'آیا از حذف این طرحبندی اطمینان دارید؟'
     ],
     'partial' => [
+        'not_found_name' => "بخشی با نام ':name' یافت نشد.",
         'invalid_name' => "نام بخش نا معتبر است: :name.",
-        'not_found' => "بخشی با نام ':name' یافت نشد.",
         'menu_label' => 'بخش ها',
         'no_list_records' => 'بخشی وجود ندارد',
         'delete_confirm_multiple' => 'آیا از حذف بخش های انتخاب شده اطمینان دارید؟',
@@ -63,7 +63,7 @@ return [
         'new' => 'بخش بندی جدید'
     ],
     'content' => [
-        'not_found' => "فایل محتوای ':name' یافت نشد.",
+        'not_found_name' => "فایل محتوای ':name' یافت نشد.",
         'menu_label' => 'محتوا',
         'no_list_records' => 'هیچ فایل محتوایی وجود ندارد',
         'delete_confirm_multiple' => 'آیا از خذف فایل ها و یا پوشه های انتخاب شده اطمینان دارید؟',
diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php
index 9e6baac3c..cae392e9a 100644
--- a/modules/cms/lang/fr/lang.php
+++ b/modules/cms/lang/fr/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- aucun layout --'
     ],
     'layout' => [
-        'not_found' => "Le layout ':name' est introuvable",
+        'not_found_name' => "Le layout ':name' est introuvable",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Aucun layout trouvé',
         'new' => 'Nouveau layout',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Voulez-vous vraiment supprimer ce layout ?'
     ],
     'partial' => [
+        'not_found_name' => "Le partial ':name' est introuvable.",
         'invalid_name' => "nom de partial invalide: :name.",
-        'not_found' => "Le partial ':name' est introuvable.",
         'menu_label' => 'Partials',
         'no_list_records' => 'Aucun partial trouvé',
         'delete_confirm_multiple' => 'Voulez-vous vraiment supprimer les partials sélectionnés ?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Nouveau partial'
     ],
     'content' => [
-        'not_found' => "Le fichier de contenu ':name' est introuvable.",
+        'not_found_name' => "Le fichier de contenu ':name' est introuvable.",
         'menu_label' => 'Contenu',
         'no_list_records' => 'Aucun fichier de contenu trouvé',
         'delete_confirm_multiple' => 'Voulez-vous vraiment supprimer les fichiers de contenu ou répertoires sélectionnés ?',
diff --git a/modules/cms/lang/hu/lang.php b/modules/cms/lang/hu/lang.php
index e61596e56..c8898c7ca 100644
--- a/modules/cms/lang/hu/lang.php
+++ b/modules/cms/lang/hu/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- nincs elrendezés --'
     ],
     'layout' => [
-        'not_found' => "A(z) ':name' elrendezés nem található",
+        'not_found_name' => "A(z) ':name' elrendezés nem található",
         'menu_label' => 'Elrendezések',
         'unsaved_label' => 'Nem mentett elrendezés(ek)',
         'no_list_records' => 'Nem találhatók elrendezések',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => 'Valóban törölni akarja ezt az elrendezést?'
     ],
     'partial' => [
+        'not_found_name' => "A(z) ':name' részlap nem található.",
         'invalid_name' => 'Érvénytelen részlapnév: :name.',
-        'not_found' => "A(z) ':name' részlap nem található.",
         'menu_label' => 'Részlapok',
         'unsaved_label' => 'Nem mentett részlap(ok)',
         'no_list_records' => 'Nem találhatók részlapok',
@@ -73,7 +73,7 @@ return [
         'new' => 'Új részlap'
     ],
     'content' => [
-        'not_found' => "A(z) ':name' tartalomfájl nem található.",
+        'not_found_name' => "A(z) ':name' tartalomfájl nem található.",
         'menu_label' => 'Tartalom',
         'unsaved_label' => 'Nem mentett tartalom',
         'no_list_records' => 'Nem találhatók tartalomfájlok',
diff --git a/modules/cms/lang/it/lang.php b/modules/cms/lang/it/lang.php
index 0f64b57fc..8d489ffdd 100644
--- a/modules/cms/lang/it/lang.php
+++ b/modules/cms/lang/it/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- nessun layout --'
     ],
     'layout' => [
-        'not_found' => "Il layout ':name' non è stato trovato",
+        'not_found_name' => "Il layout ':name' non è stato trovato",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Nessun layout trovato',
         'new' => 'Nuovo layout',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Sei sicuro di voler eliminare questo layout?'
     ],
     'partial' => [
+        'not_found_name' => "La vista parziale ':name' non è stata trovata.",
         'invalid_name' => "Nome della vista parziale non valido: :name.",
-        'not_found' => "La vista parziale ':name' non è stata trovata.",
         'menu_label' => 'Viste parziali',
         'no_list_records' => 'Nessuna vista parziale trovata',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare le viste parziali selezionate?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Nuova vista parziale'
     ],
     'content' => [
-        'not_found' => "Il file di contenuto ':name' non è stato trovato.",
+        'not_found_name' => "Il file di contenuto ':name' non è stato trovato.",
         'menu_label' => 'Contenuti',
         'no_list_records' => 'Nessun file di contenuto trovato',
         'delete_confirm_multiple' => 'Sei sicuro di voler eliminare i file o le cartelle di contenuti selezionate?',
diff --git a/modules/cms/lang/ja/lang.php b/modules/cms/lang/ja/lang.php
index a2e5ee6e9..81bf8ca61 100644
--- a/modules/cms/lang/ja/lang.php
+++ b/modules/cms/lang/ja/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- レイアウト無し --',
     ],
     'layout' => [
-        'not_found' => "レイアウト':name'が見つかりません。",
+        'not_found_name' => "レイアウト':name'が見つかりません。",
         'menu_label' => 'レイアウト',
         'unsaved_label' => '保存されていないレイアウト',
         'no_list_records' => 'レイアウトが見つかりません',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => '本当にこのページを削除しますか？',
     ],
     'partial' => [
+        'not_found_name' => "':name'パーシャルが見つかりません。",
         'invalid_name' => "正しくないパーシャル名：:name。",
-        'not_found' => "':name'パーシャルが見つかりません。",
         'menu_label' => 'パーシャル',
         'unsaved_label' => '保存されていないパーシャル(s)',
         'no_list_records' => 'パーシャルが見つかりません。',
@@ -73,7 +73,7 @@ return [
         'new' => '新パーシャル',
     ],
     'content' => [
-        'not_found' => "':name'コンテンツファイルが見つかりません。",
+        'not_found_name' => "':name'コンテンツファイルが見つかりません。",
         'menu_label' => 'コンテンツ',
         'unsaved_label' => '保存されていないコンテンツ',
         'no_list_records' => 'コンテンツファイルが見つかりません',
diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php
index d94712d72..edeb86b2e 100644
--- a/modules/cms/lang/nl/lang.php
+++ b/modules/cms/lang/nl/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- geen layout --'
     ],
     'layout' => [
-        'not_found' => "De layout ':name' is niet gevonden",
+        'not_found_name' => "De layout ':name' is niet gevonden",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Geen layouts gevonden',
         'new' => 'Nieuwe layout',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Weet je zeker dat je deze layout wilt verwijderen?'
     ],
     'partial' => [
+        'not_found_name' => "Het sjabloon (partial) ':name' is niet gevonden.",
         'invalid_name' => "Ongeldige naam voor sjabloon (partial): :name.",
-        'not_found' => "Het sjabloon (partial) ':name' is niet gevonden.",
         'menu_label' => 'Sjablonen',
         'no_list_records' => 'Geen sjablonen (partial) gevonden',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde sjablonen wilt verwijderen?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Nieuw sjabloon'
     ],
     'content' => [
-        'not_found' => "Het tekstblok (content) ':name' is niet gevonden.",
+        'not_found_name' => "Het tekstblok (content) ':name' is niet gevonden.",
         'menu_label' => 'Tekstblokken',
         'no_list_records' => 'Geen tekstblokken (content) gevonden',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde tekstblokken of mappen wilt verwijderen?',
diff --git a/modules/cms/lang/pl/lang.php b/modules/cms/lang/pl/lang.php
index 64a0b717c..d91228c7f 100644
--- a/modules/cms/lang/pl/lang.php
+++ b/modules/cms/lang/pl/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- brak układu --'
     ],
     'layout' => [
-        'not_found' => "Nie znaleziono układu ':name'",
+        'not_found_name' => "Nie znaleziono układu ':name'",
         'menu_label' => 'Układy',
         'unsaved_label' => 'Niezapisane układy',
         'no_list_records' => 'Nie znaleziono układów',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => 'Czy na pewno chcesz skasować ten układ?'
     ],
     'partial' => [
+        'not_found_name' => "Fragment ':name' nie został znaleziony.",
         'invalid_name' => 'Nieprawidłowa nazwa fragmentu: :name.',
-        'not_found' => "Fragment ':name' nie został znaleziony.",
         'menu_label' => 'Fragmenty',
         'unsaved_label' => 'Niezapisane fragmenty',
         'no_list_records' => 'Nie znaleziono fragmentów',
@@ -73,7 +73,7 @@ return [
         'new' => 'Nowy fragment'
     ],
     'content' => [
-        'not_found' => "Plik treści ':name' nie został znaleziony.",
+        'not_found_name' => "Plik treści ':name' nie został znaleziony.",
         'menu_label' => 'Treść',
         'unsaved_label' => 'Niezapisana treść',
         'no_list_records' => 'Nie znaleziono plików treści',
diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php
index 8a42b491a..c869d45d8 100644
--- a/modules/cms/lang/pt-br/lang.php
+++ b/modules/cms/lang/pt-br/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- sem layout --'
     ],
     'layout' => [
-        'not_found' => "O layout ':name' não foi encontrado",
+        'not_found_name' => "O layout ':name' não foi encontrado",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Nenhum layout foi encontrado',
         'new' => 'Novo layout',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Você realmente quer excluir este layout?'
     ],
     'partial' => [
+        'not_found_name' => "O bloco ':name' não foi encontrado.",
         'invalid_name' => "Nome bloco inválido: :name.",
-        'not_found' => "O bloco ':name' não foi encontrado.",
         'menu_label' => 'Blocos',
         'no_list_records' => 'Nenhum bloco foi encontrado',
         'delete_confirm_multiple' => 'Você realmente quer apagar os blocos selecionados?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Novo bloco'
     ],
     'content' => [
-        'not_found' => "O arquivo de conteúdo ':name' não foi encontrado.",
+        'not_found_name' => "O arquivo de conteúdo ':name' não foi encontrado.",
         'menu_label' => 'Conteúdo',
         'no_list_records' => 'Nenhum arquivo de conteúdo foi encontrado',
         'delete_confirm_multiple' => 'Você realmente quer apagar arquivos de conteúdo selecionados ou diretórios?',
diff --git a/modules/cms/lang/ro/lang.php b/modules/cms/lang/ro/lang.php
index dfa63935b..9fad12082 100644
--- a/modules/cms/lang/ro/lang.php
+++ b/modules/cms/lang/ro/lang.php
@@ -46,7 +46,7 @@ return [
         'no_layout' => '-- fara macheta --'
     ],
     'layout' => [
-        'not_found' => "Macheta ':name' nu a fost gasita",
+        'not_found_name' => "Macheta ':name' nu a fost gasita",
         'menu_label' => 'Machete',
         'no_list_records' => 'Nu au fost gasite machete',
         'new' => 'Macheta noua',
@@ -54,8 +54,8 @@ return [
         'delete_confirm_single' => 'Vreti sa stergeti macheta selectata?'
     ],
     'partial' => [
+        'not_found_name' => "Componenta partiala ':name' nu a fost gasita.",
         'invalid_name' => "Nume invalid pentru componenta partiala: :name.",
-        'not_found' => "Componenta partiala ':name' nu a fost gasita.",
         'menu_label' => 'Componente partiale',
         'no_list_records' => 'Nu au fost gasite componente partiale',
         'delete_confirm_multiple' => 'Vreti sa stergeti componentele partiale selectate?',
@@ -63,7 +63,7 @@ return [
         'new' => 'Componenta partiala noua'
     ],
     'content' => [
-        'not_found' => "Fisierul de continut ':name' nu a fost gasit.",
+        'not_found_name' => "Fisierul de continut ':name' nu a fost gasit.",
         'menu_label' => 'Continut',
         'no_list_records' => 'Nu au fost gasite fisiere de continut',
         'delete_confirm_multiple' => 'Vreti sa stergeti fisierele si directoarele cu continut?',
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
index 226a23bf7..b059e3026 100644
--- a/modules/cms/lang/ru/lang.php
+++ b/modules/cms/lang/ru/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- без шаблона --'
     ],
     'layout' => [
-        'not_found' => "Не удалось найти шаблон (layout) с именем :name.",
+        'not_found_name' => "Не удалось найти шаблон (layout) с именем :name.",
         'menu_label' => 'Шаблоны',
         'unsaved_label' => 'Несохранённый(е) макет(ы)',
         'no_list_records' => 'Шаблоны не найдены',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => 'Вы действительно хотите удалить этот шаблон?'
     ],
     'partial' => [
+        'not_found_name' => "Не удалось найти шаблон (partial) с именем :name.",
         'invalid_name' => "Ошибка в имени шаблона (partial) :name.",
-        'not_found' => "Не удалось найти шаблон (partial) с именем :name.",
         'menu_label' => 'Фрагменты',
         'unsaved_label' => 'Несохранённый(е) фрагмент(ы)',
         'no_list_records' => 'Фрагменты не найдены',
@@ -73,7 +73,7 @@ return [
         'new' => 'Новый фрагмент'
     ],
     'content' => [
-        'not_found' => "Не удалось найти файл содержимого (content file): ':name'.",
+        'not_found_name' => "Не удалось найти файл содержимого (content file): ':name'.",
         'menu_label' => 'Содержимое',
         'unsaved_label' => 'Несохранённое содержимое',
         'no_list_records' => 'Файлы с содержимым не найдены',
diff --git a/modules/cms/lang/sk/lang.php b/modules/cms/lang/sk/lang.php
index a05af3a63..ae93e15ee 100644
--- a/modules/cms/lang/sk/lang.php
+++ b/modules/cms/lang/sk/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- no layout --'
     ],
     'layout' => [
-        'not_found' => "The layout ':name' is not found",
+        'not_found_name' => "The layout ':name' is not found",
         'menu_label' => 'Layouts',
         'unsaved_label' => 'Unsaved layout(s)',
         'no_list_records' => 'No layouts found',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => 'Do you really want delete this layout?'
     ],
     'partial' => [
+        'not_found_name' => "The partial ':name' is not found.",
         'invalid_name' => 'Invalid partial name: :name.',
-        'not_found' => "The partial ':name' is not found.",
         'menu_label' => 'Partials',
         'unsaved_label' => 'Unsaved partial(s)',
         'no_list_records' => 'No partials found',
@@ -73,7 +73,7 @@ return [
         'new' => 'New partial'
     ],
     'content' => [
-        'not_found' => "The content file ':name' is not found.",
+        'not_found_name' => "The content file ':name' is not found.",
         'menu_label' => 'Content',
         'unsaved_label' => 'Unsaved content',
         'no_list_records' => 'No content files found',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 3c108ab83..2c4853e32 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -40,7 +40,7 @@ return [
         'no_layout' => '-- ingen layout --'
     ],
     'layout' => [
-        'not_found' => "Layouten ':name' hittades ej",
+        'not_found_name' => "Layouten ':name' hittades ej",
         'menu_label' => 'Layouter',
         'no_list_records' => 'Inga layouter funna',
         'new' => 'Ny layout',
@@ -48,8 +48,8 @@ return [
         'delete_confirm_single' => 'Vill du verkligen radera denna layouter?'
     ],
     'partial' => [
+        'not_found_name' => "En partial med namnet ':name' kunde ej hittas",
         'invalid_name' => "Felaktigt partialnamn: :name",
-        'not_found' => "En partial med namnet ':name' kunde ej hittas",
         'menu_label' => 'Partials',
         'no_list_records' => 'Inga partials funna',
         'delete_confirm_multiple' => 'Vill du verkligen radera markerade partials?',
@@ -57,7 +57,7 @@ return [
         'new' => 'Ny partial'
     ],
     'content' => [
-        'not_found' => "Innehållet ':name' kunde ej hittas",
+        'not_found_name' => "Innehållet ':name' kunde ej hittas",
         'menu_label' => 'Innehåll',
         'no_list_records' => 'Inga innehållsfiler funna',
         'delete_confirm_multiple' => 'Vill du verkligen radera markerade filer eller mappar?',
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index 6976f5c1d..d6d927657 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -54,7 +54,7 @@ return [
         'no_layout' => '-- şablon yok --'
     ],
     'layout' => [
-        'not_found' => "':name' isimli şablon bulunamadı",
+        'not_found_name' => "':name' isimli şablon bulunamadı",
         'menu_label' => 'Şablonlar',
         'unsaved_label' => 'Kaydedilmemiş şablon(lar)',
         'no_list_records' => 'Şablon bulunamadı',
@@ -63,8 +63,8 @@ return [
         'delete_confirm_single' => 'Seçili şablonu silmek istediğinize emin misiniz?'
     ],
     'partial' => [
+        'not_found_name' => "':name' bölümü bulunamadı.",
         'invalid_name' => "Hatalı bölüm adı: :name.",
-        'not_found' => "':name' bölümü bulunamadı.",
         'menu_label' => 'Bölümler',
         'unsaved_label' => 'Kaydedilmemiş bölüm(ler)',
         'no_list_records' => 'Bölüm bulunamadı.',
@@ -73,7 +73,7 @@ return [
         'new' => 'Bölüm Oluştur'
     ],
     'content' => [
-        'not_found' => "':name' isminde içerik dosyası bulunamadı.",
+        'not_found_name' => "':name' isminde içerik dosyası bulunamadı.",
         'menu_label' => 'İçerik',
         'unsaved_label' => 'Kaydedilmemiş içerik',
         'no_list_records' => 'İçerik dosyası bulunamadı.',
diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
index 4332c9134..c7d409820 100644
--- a/modules/system/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -57,7 +57,7 @@ trait ViewMaker
 
         if (!File::exists($partialPath)) {
             if ($throwException) {
-                throw new SystemException(Lang::get('backend::lang.partial.not_found', ['name' => $partialPath]));
+                throw new SystemException(Lang::get('backend::lang.partial.not_found_name', ['name' => $partialPath]));
             }
             else {
                 return false;
@@ -117,7 +117,7 @@ trait ViewMaker
 
         if (!File::exists($layoutPath)) {
             if ($throwException) {
-                throw new SystemException(Lang::get('cms::lang.layout.not_found', ['name' => $layoutPath]));
+                throw new SystemException(Lang::get('cms::lang.layout.not_found_name', ['name' => $layoutPath]));
             }
             else {
                 return false;