diff --git a/app/admin/formwidgets/ScheduleEditor.php b/app/admin/formwidgets/ScheduleEditor.php
index a608a2ac76..828ee8744f 100644
--- a/app/admin/formwidgets/ScheduleEditor.php
+++ b/app/admin/formwidgets/ScheduleEditor.php
@@ -3,11 +3,13 @@
 namespace Admin\FormWidgets;
 
 use Admin\Classes\BaseFormWidget;
+use Admin\Models\Locations_model;
 use Admin\Models\Working_hours_model;
 use Admin\Traits\ValidatesForm;
 use Admin\Widgets\Form;
 use Igniter\Flame\Exception\ApplicationException;
 use Igniter\Flame\Location\Models\AbstractLocation;
+use Igniter\Flame\Location\OrderTypes;
 use Illuminate\Support\Facades\DB;
 
 class ScheduleEditor extends BaseFormWidget
@@ -72,7 +74,7 @@ public function onLoadRecord()
         $scheduleCode = post('recordId');
         $scheduleItem = $this->getSchedule($scheduleCode);
 
-        $formTitle = sprintf(lang($this->formTitle), lang('admin::lang.text_'.$scheduleCode));
+        $formTitle = sprintf(lang($this->formTitle), lang($scheduleItem->name));
 
         return $this->makePartial('recordeditor/form', [
             'formRecordId' => $scheduleCode,
@@ -125,10 +127,15 @@ protected function listSchedules()
         if ($this->schedulesCache)
             return $this->schedulesCache;
 
-        $schedules = [];
-        foreach ($this->model->availableWorkingTypes() as $scheduleCode) {
-            $schedules[$scheduleCode] = $this->model->createScheduleItem($scheduleCode);
-        }
+        $schedules = collect(OrderTypes::instance()->listOrderTypes())
+            ->prepend(['name' => 'admin::lang.text_opening'], Locations_model::OPENING)
+            ->mapWithKeys(function ($definition, $code) {
+                $scheduleItem = $this->model->createScheduleItem($code);
+                $scheduleItem->name = array_get($definition, 'name');
+
+                return [$code => $scheduleItem];
+            })
+            ->all();
 
         return $this->schedulesCache = $schedules;
     }
diff --git a/app/admin/formwidgets/scheduleeditor/schedules.blade.php b/app/admin/formwidgets/scheduleeditor/schedules.blade.php
index ff42df25c7..b6572c5b9b 100644
--- a/app/admin/formwidgets/scheduleeditor/schedules.blade.php
+++ b/app/admin/formwidgets/scheduleeditor/schedules.blade.php
@@ -1,16 +1,16 @@
-<div class="row">
-    @foreach ($schedules as $schedule)
-        <div class="col-lg-4 py-3">
+<div class="d-flex flex-nowrap overflow-auto">
+    @foreach ($schedules as $scheduleCode => $schedule)
+        <div class="col-lg-3 {{ $loop->first ? 'py-2 pr-2 pl-0' : 'p-2' }}">
             <div
                 id="{{ $this->getId('item-'.$loop->iteration) }}"
                 class="card bg-light shadow-sm mb-0"
                 data-editor-control="load-schedule"
-                data-schedule-code="{{ $schedule->name }}"
+                data-schedule-code="{{ $scheduleCode }}"
                 role="button"
             >
                 <div class="card-body">
                     <div class="flex-fill">
-                        <h5 class="card-title">{{ lang('admin::lang.text_'.$schedule->name).' '.lang('admin::lang.locations.text_schedule') }}</h5>
+                        <h5 class="card-title">{{ lang($schedule->name).' '.lang('admin::lang.locations.text_schedule') }}</h5>
                         <p class="card-text">{{ lang('admin::lang.locations.text_'.$schedule->type) }}</p>
                     </div>
 
diff --git a/app/main/formwidgets/components/component.blade.php b/app/main/formwidgets/components/component.blade.php
index a742e229cd..d75149ac76 100644
--- a/app/main/formwidgets/components/component.blade.php
+++ b/app/main/formwidgets/components/component.blade.php
@@ -3,7 +3,7 @@ class="components-item"
     data-control="component"
     data-component-alias="{{ $component->alias }}"
 >
-    <div class="btn btn-light text-left p-3 component{{ $component->fatalError ? ' border-danger' : '' }}">
+    <div class="btn btn-light text-left p-3 w-100 component{{ $component->fatalError ? ' border-danger' : '' }}">
         <div
             class="components-item-info"
             data-component-control="load"
diff --git a/app/system/models/config/mail_templates_model.php b/app/system/models/config/mail_templates_model.php
index 0f3e1ec3fd..74bcd3f702 100644
--- a/app/system/models/config/mail_templates_model.php
+++ b/app/system/models/config/mail_templates_model.php
@@ -62,6 +62,7 @@
         'label' => 'lang:admin::lang.column_date_added',
         'type' => 'timetense',
         'searchable' => TRUE,
+        'invisible' => TRUE,
     ],
     'template_id' => [
         'label' => 'lang:admin::lang.column_id',