diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 92d163fbb0..1897f47ba3 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -4,8 +4,6 @@
 {{/each}}
 </div>
 
-<link href="{{basePath}}client/css/espo/misc/layout-manager-grid.css" rel="stylesheet">
-
 <div id="layout" class="row">
     <div class="col-md-8">
         <div class="well">
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index d8cbaea639..6e8de05802 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -4,8 +4,6 @@
 {{/each}}
 </div>
 
-<link href="{{basePath}}client/css/espo/misc/layout-manager-rows.css" rel="stylesheet">
-
 <div id="layout" class="row">
     <div class="col-sm-5">
         <div class="well">
diff --git a/client/src/views/admin/layouts/grid.js b/client/src/views/admin/layouts/grid.js
index 4c127ef734..460bf02f06 100644
--- a/client/src/views/admin/layouts/grid.js
+++ b/client/src/views/admin/layouts/grid.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/admin/layouts/grid', 'views/admin/layouts/base', function (Dep) {
+define('views/admin/layouts/grid', ['views/admin/layouts/base', 'res!client/css/espo/misc/layout-manager-grid.css'], function (Dep, styleCss) {
 
     return Dep.extend({
 
@@ -209,6 +209,12 @@ define('views/admin/layouts/grid', 'views/admin/layouts/base', function (Dep) {
             Dep.prototype.setup.call(this);
 
             this.panelsData = {};
+
+            this.$style = $('<style>').html(styleCss).appendTo($('body'));
+        },
+
+        onRemove: function () {
+            if (this.$style) this.$style.remove();
         },
 
         addPanel: function () {
diff --git a/client/src/views/admin/layouts/rows.js b/client/src/views/admin/layouts/rows.js
index fccfc800ac..5a76617b1d 100644
--- a/client/src/views/admin/layouts/rows.js
+++ b/client/src/views/admin/layouts/rows.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/admin/layouts/rows', 'views/admin/layouts/base', function (Dep) {
+define('views/admin/layouts/rows', ['views/admin/layouts/base', 'res!client/css/espo/misc/layout-manager-rows.css'], function (Dep, styleCss) {
 
     return Dep.extend({
 
@@ -63,9 +63,14 @@ Espo.define('views/admin/layouts/rows', 'views/admin/layouts/base', function (De
             Dep.prototype.setup.call(this);
 
             this.on('update-item', function (name, attributes) {
-                console.log(name, attributes);
                 this.itemsData[name] = Espo.Utils.cloneDeep(attributes);
             }, this);
+
+            this.$style = $('<style>').html(styleCss).appendTo($('body'));
+        },
+
+        onRemove: function () {
+            if (this.$style) this.$style.remove();
         },
 
         editRow: function (name) {