diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php
index 924fbd8a78..f51b35a702 100644
--- a/application/Espo/Modules/Crm/Services/Activities.php
+++ b/application/Espo/Modules/Crm/Services/Activities.php
@@ -1043,9 +1043,9 @@ class Activities extends \Espo\Core\Services\Base
             'createdAt'
         ];
 
-        $wherePart = array(
+        $wherePart = [
             'assignedUserId' => $userId,
-        );
+        ];
 
         if ($seed->hasRelation('users')) {
             $wherePart['usersMiddle.userId'] = $userId;
@@ -1055,35 +1055,39 @@ class Activities extends \Espo\Core\Services\Base
             $wherePart['assignedUsersMiddle.userId'] = $userId;
         }
 
-        $selectParams = array(
+        $selectParams = [
             'select' => $select,
             'leftJoins' => [],
-            'whereClause' => array(
+            'whereClause' => [
                 'OR' => $wherePart,
-                array(
-                    'OR' => array(
-                        array(
+                [
+                    'OR' => [
+                        [
                             'dateEnd' => null,
                             'dateStart>=' => $from,
                             'dateStart<' => $to
-                        ),
-                        array(
+                        ],
+                        [
+                            'dateStart>=' => $from,
+                            'dateStart<' => $to
+                        ],
+                        [
                             'dateEnd>=' => $from,
                             'dateEnd<' => $to
-                        ),
-                        array(
+                        ],
+                        [
                             'dateStart<=' => $from,
                             'dateEnd>=' => $to
-                        ),
-                        array(
+                        ],
+                        [
                             'dateEndDate!=' => null,
                             'dateEndDate>=' => $from,
                             'dateEndDate<' => $to
-                        )
-                    )
-                )
-            )
-        );
+                        ]
+                    ]
+                ]
+            ]
+        ];
 
         if ($seed->hasRelation('users')) {
             $selectParams['leftJoins'][] = 'users';
diff --git a/client/modules/crm/res/templates/calendar/timeline.tpl b/client/modules/crm/res/templates/calendar/timeline.tpl
index 7383aa9927..2b796664e9 100644
--- a/client/modules/crm/res/templates/calendar/timeline.tpl
+++ b/client/modules/crm/res/templates/calendar/timeline.tpl
@@ -4,8 +4,8 @@
 <div class="row button-container">
     <div class="col-sm-4 col-xs-12">
         <div class="btn-group">
-            <button class="btn btn-text" data-action="today">{{translate 'Today' scope='Calendar'}}</button>
             <button class="btn btn-text btn-icon" title="{{translate 'Refresh'}}" data-action="refresh"><span class="fas fa-sync-alt"></span></button>
+            <button class="btn btn-text" data-action="today">{{translate 'Today' scope='Calendar'}}</button>
         </div>{{#if calendarTypeSelectEnabled}}<div class="btn-group calendar-type-button-group">
         <div class="btn-group " role="group">
             <button type="button" class="btn btn-text dropdown-toggle" data-toggle="dropdown"><span class="calendar-type-label">{{calendarTypeLabel}}</span> <span class="caret"></span></button>
@@ -24,7 +24,6 @@
         {{/if}}
     </div>
 
-
     <div class="date-title col-sm-4 hidden-xs"><h4><span style="cursor: pointer;" data-action="refresh" title="{{translate 'Refresh'}}"></span></h4></div>
 
     <div class="col-sm-4 col-xs-12">
diff --git a/client/modules/crm/src/views/meeting/modals/detail.js b/client/modules/crm/src/views/meeting/modals/detail.js
index 8721042494..c12d793789 100644
--- a/client/modules/crm/src/views/meeting/modals/detail.js
+++ b/client/modules/crm/src/views/meeting/modals/detail.js
@@ -40,6 +40,7 @@ define('crm:views/meeting/modals/detail', 'views/modals/detail', function (Dep)
                 html: buttonData.html,
                 hidden: this.hasAcceptanceStatusButton(),
                 style: buttonData.style,
+                pullLeft: true,
             }, 'cancel');
 
             if (
diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 2f8d43f933..a9dfa646d9 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -76,7 +76,7 @@
         display: none;
     }
     #layout header {
-        font-weight: bold;
+        font-weight: 600;
         margin-bottom: 10px;
     }
     #layout ul.panels > li label {
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index ecb7c5a666..9df1b4ff51 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -22,7 +22,7 @@
     }
 
     #layout header {
-        font-weight: bold;
+        font-weight: 600;
     }
 
     #layout ul > li .left {
diff --git a/client/res/templates/stream.tpl b/client/res/templates/stream.tpl
index 2758349911..dc7cbc1d6b 100644
--- a/client/res/templates/stream.tpl
+++ b/client/res/templates/stream.tpl
@@ -8,9 +8,9 @@
         <div class="col-sm-5 col-xs-7">
             <div class="pull-right btn-group">
                 {{#each filterList}}
-                <button class="btn btn-default{{#ifEqual this ../filter}} active{{/ifEqual}}" data-action="selectFilter" data-name="{{./this}}">{{translate this scope='Note' category='filters'}}</button>
+                <button class="btn btn-text{{#ifEqual this ../filter}} active{{/ifEqual}}" data-action="selectFilter" data-name="{{./this}}">{{translate this scope='Note' category='filters'}}</button>
                 {{/each}}
-                <button class="btn btn-default btn-icon btn-icon-wide" data-action="refresh" title="{{translate 'checkForNewNotes' category='messages'}}"><span class="fas fa-sync-alt"></span></button>
+                <button class="btn btn-text btn-icon btn-icon-wide" data-action="refresh" title="{{translate 'checkForNewNotes' category='messages'}}"><span class="fas fa-sync-alt"></span></button>
             </div>
         </div>
     </div>
diff --git a/client/src/views/main.js b/client/src/views/main.js
index e17ba0628a..ceb8037bb5 100644
--- a/client/src/views/main.js
+++ b/client/src/views/main.js
@@ -56,6 +56,20 @@ define('views/main', 'view', function (Dep) {
 
             ['buttons', 'actions', 'dropdown'].forEach(function (type) {
                 this.menu[type] = this.menu[type] || [];
+
+                var itemList = this.menu[type];
+                itemList.forEach(function (item) {
+                    var viewObject = this;
+                    if (item.initFunction && item.data.handler) {
+                        this.wait(new Promise(function (resolve) {
+                            require(item.data.handler, function (Handler) {
+                                var handler = new Handler(viewObject);
+                                handler[item.initFunction].call(handler);
+                                resolve();
+                            });
+                        }));
+                    }
+                }, this);
             }, this);
 
             this.updateLastUrl();
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 97585e0aea..c4da3db311 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -3026,9 +3026,14 @@ a.link-gray {
 }
 
 .btn-text {
-    color: @gray-soft;
+    color: @gray-dark;
     border-radius: 0;
 
+    .far,
+    .fas {
+        color: @gray-soft;
+    }
+
     &,
     &:active,
     &.active,
@@ -3048,6 +3053,10 @@ a.link-gray {
         color: @gray-dark;
         text-decoration: none;
         background-color: transparent;
+        .far,
+        .fas {
+            color: @gray-dark;
+        }
     }
     &.disabled,
     &[disabled],
@@ -3058,12 +3067,16 @@ a.link-gray {
             text-decoration: none;
         }
         color: @gray-light;
+        .far,
+        .fas {
+            color: @gray-light;
+        }
     }
     &.active {
         border-bottom: 1px solid @gray-light;
     }
 
-    font-weight: 600;
+    font-weight: 400;
 }
 
 .btn-group.open .dropdown-toggle {