diff --git a/source/event_editor.dfm b/source/event_editor.dfm
index 14933225..de3913c8 100644
--- a/source/event_editor.dfm
+++ b/source/event_editor.dfm
@@ -1,17 +1,17 @@
 object frmEventEditor: TfrmEventEditor
   Left = 0
   Top = 0
-  Width = 672
-  Height = 438
+  Width = 700
+  Height = 500
   TabOrder = 0
   DesignSize = (
-    672
-    438)
+    700
+    500)
   object lblBody: TLabel
     AlignWithMargins = True
     Left = 3
     Top = 175
-    Width = 666
+    Width = 694
     Height = 13
     Align = alTop
     Caption = 'Execution body:'
@@ -21,8 +21,8 @@ object frmEventEditor: TfrmEventEditor
     AlignWithMargins = True
     Left = 3
     Top = 194
-    Width = 666
-    Height = 214
+    Width = 694
+    Height = 276
     Margins.Bottom = 30
     SingleLineMode = False
     Align = alClient
@@ -50,7 +50,7 @@ object frmEventEditor: TfrmEventEditor
   end
   object btnHelp: TButton
     Left = 3
-    Top = 410
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -60,7 +60,7 @@ object frmEventEditor: TfrmEventEditor
   end
   object btnDiscard: TButton
     Left = 84
-    Top = 410
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -70,7 +70,7 @@ object frmEventEditor: TfrmEventEditor
   end
   object btnSave: TButton
     Left = 165
-    Top = 410
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -83,7 +83,7 @@ object frmEventEditor: TfrmEventEditor
     AlignWithMargins = True
     Left = 3
     Top = 3
-    Width = 666
+    Width = 694
     Height = 166
     ActivePage = tabSettings
     Align = alTop
@@ -94,7 +94,7 @@ object frmEventEditor: TfrmEventEditor
       Caption = 'Settings'
       ImageIndex = 39
       DesignSize = (
-        658
+        686
         137)
       object lblName: TLabel
         Left = 3
@@ -131,7 +131,7 @@ object frmEventEditor: TfrmEventEditor
       object chkDropAfterExpiration: TCheckBox
         Left = 84
         Top = 57
-        Width = 571
+        Width = 599
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Drop event after expiration'
@@ -141,7 +141,7 @@ object frmEventEditor: TfrmEventEditor
       object editComment: TEdit
         Left = 84
         Top = 30
-        Width = 571
+        Width = 599
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 1
@@ -161,7 +161,7 @@ object frmEventEditor: TfrmEventEditor
       object comboDefiner: TComboBox
         Left = 489
         Top = 3
-        Width = 166
+        Width = 194
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 4
diff --git a/source/routine_editor.dfm b/source/routine_editor.dfm
index c24eee0d..353589cd 100644
--- a/source/routine_editor.dfm
+++ b/source/routine_editor.dfm
@@ -1,17 +1,17 @@
 object frmRoutineEditor: TfrmRoutineEditor
   Left = 0
   Top = 0
-  Width = 606
-  Height = 484
+  Width = 700
+  Height = 500
   TabOrder = 0
   DesignSize = (
-    606
-    484)
+    700
+    500)
   object lblSQLcode: TLabel
     AlignWithMargins = True
     Left = 3
     Top = 183
-    Width = 600
+    Width = 694
     Height = 13
     Align = alTop
     Caption = 'Routine body:'
@@ -20,7 +20,7 @@ object frmRoutineEditor: TfrmRoutineEditor
   end
   object lblDisabledWhy: TLabel
     Left = 256
-    Top = 460
+    Top = 476
     Width = 177
     Height = 13
     Anchors = [akLeft, akBottom]
@@ -30,7 +30,7 @@ object frmRoutineEditor: TfrmRoutineEditor
   object spltTop: TSplitter
     Left = 0
     Top = 172
-    Width = 606
+    Width = 700
     Height = 8
     Cursor = crSizeNS
     Align = alTop
@@ -38,7 +38,7 @@ object frmRoutineEditor: TfrmRoutineEditor
   end
   object btnSave: TButton
     Left = 165
-    Top = 455
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -49,7 +49,7 @@ object frmRoutineEditor: TfrmRoutineEditor
   end
   object btnDiscard: TButton
     Left = 84
-    Top = 455
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -60,7 +60,7 @@ object frmRoutineEditor: TfrmRoutineEditor
   end
   object btnHelp: TButton
     Left = 3
-    Top = 455
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -72,8 +72,8 @@ object frmRoutineEditor: TfrmRoutineEditor
     AlignWithMargins = True
     Left = 3
     Top = 202
-    Width = 600
-    Height = 242
+    Width = 694
+    Height = 258
     Margins.Bottom = 40
     SingleLineMode = False
     Align = alClient
@@ -117,7 +117,7 @@ object frmRoutineEditor: TfrmRoutineEditor
     AlignWithMargins = True
     Left = 3
     Top = 3
-    Width = 600
+    Width = 694
     Height = 166
     ActivePage = tabOptions
     Align = alTop
@@ -128,7 +128,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       Caption = 'Options'
       ImageIndex = 39
       DesignSize = (
-        592
+        686
         137)
       object lblName: TLabel
         Left = 3
@@ -188,7 +188,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       object chkDeterministic: TCheckBox
         Left = 84
         Top = 114
-        Width = 508
+        Width = 602
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = '&Deterministic'
@@ -198,7 +198,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       object editComment: TEdit
         Left = 84
         Top = 35
-        Width = 505
+        Width = 599
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 2
@@ -208,7 +208,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       object comboSecurity: TComboBox
         Left = 489
         Top = 87
-        Width = 100
+        Width = 194
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -218,7 +218,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       object comboDataAccess: TComboBox
         Left = 489
         Top = 62
-        Width = 100
+        Width = 194
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -256,7 +256,7 @@ object frmRoutineEditor: TfrmRoutineEditor
       object comboDefiner: TComboBox
         Left = 489
         Top = 8
-        Width = 100
+        Width = 194
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 1
@@ -272,7 +272,7 @@ object frmRoutineEditor: TfrmRoutineEditor
         Left = 82
         Top = 0
         Width = 510
-        Height = 137
+        Height = 138
         Align = alClient
         DragImageKind = diMainColumnOnly
         DragMode = dmAutomatic
@@ -306,7 +306,7 @@ object frmRoutineEditor: TfrmRoutineEditor
           item
             Options = [coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
             Position = 1
-            Width = 321
+            Width = 325
             WideText = 'Name'
           end
           item
@@ -326,7 +326,7 @@ object frmRoutineEditor: TfrmRoutineEditor
         Left = 0
         Top = 0
         Width = 82
-        Height = 137
+        Height = 138
         Align = alLeft
         AutoSize = True
         ButtonWidth = 82
@@ -410,8 +410,8 @@ object frmRoutineEditor: TfrmRoutineEditor
     end
   end
   object btnRunProc: TButton
-    Left = 439
-    Top = 455
+    Left = 533
+    Top = 471
     Width = 164
     Height = 25
     Action = MainForm.actRunRoutines
diff --git a/source/table_editor.dfm b/source/table_editor.dfm
index 6a21e440..89d733ba 100644
--- a/source/table_editor.dfm
+++ b/source/table_editor.dfm
@@ -1,17 +1,17 @@
 object frmTableEditor: TfrmTableEditor
   Left = 0
   Top = 0
-  Width = 607
-  Height = 391
+  Width = 700
+  Height = 500
   TabOrder = 0
   DesignSize = (
-    607
-    391)
+    700
+    500)
   object SplitterTopBottom: TSplitter
     AlignWithMargins = True
     Left = 3
     Top = 153
-    Width = 601
+    Width = 694
     Height = 8
     Cursor = crSizeNS
     Margins.Top = 0
@@ -21,7 +21,7 @@ object frmTableEditor: TfrmTableEditor
   end
   object btnSave: TButton
     Left = 165
-    Top = 362
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -32,7 +32,7 @@ object frmTableEditor: TfrmTableEditor
   end
   object btnDiscard: TButton
     Left = 84
-    Top = 362
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -42,7 +42,7 @@ object frmTableEditor: TfrmTableEditor
   end
   object btnHelp: TButton
     Left = 3
-    Top = 362
+    Top = 471
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -54,8 +54,8 @@ object frmTableEditor: TfrmTableEditor
     AlignWithMargins = True
     Left = 3
     Top = 186
-    Width = 601
-    Height = 173
+    Width = 694
+    Height = 282
     Margins.Bottom = 32
     Align = alClient
     Constraints.MinHeight = 70
@@ -172,7 +172,7 @@ object frmTableEditor: TfrmTableEditor
     AlignWithMargins = True
     Left = 3
     Top = 3
-    Width = 601
+    Width = 694
     Height = 150
     Margins.Bottom = 0
     ActivePage = tabBasic
@@ -188,7 +188,7 @@ object frmTableEditor: TfrmTableEditor
       ExplicitWidth = 0
       ExplicitHeight = 0
       DesignSize = (
-        593
+        686
         121)
       object lblName: TLabel
         Left = 4
@@ -207,7 +207,7 @@ object frmTableEditor: TfrmTableEditor
       object editName: TEdit
         Left = 96
         Top = 3
-        Width = 496
+        Width = 589
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 0
@@ -218,8 +218,8 @@ object frmTableEditor: TfrmTableEditor
       object memoComment: TMemo
         Left = 96
         Top = 30
-        Width = 496
-        Height = 84
+        Width = 589
+        Height = 80
         Anchors = [akLeft, akTop, akRight, akBottom]
         Lines.Strings = (
           'memoComment')
@@ -237,7 +237,7 @@ object frmTableEditor: TfrmTableEditor
       ExplicitWidth = 0
       ExplicitHeight = 0
       DesignSize = (
-        593
+        686
         121)
       object lblAutoinc: TLabel
         Left = 4
@@ -333,7 +333,7 @@ object frmTableEditor: TfrmTableEditor
       object memoUnionTables: TMemo
         Left = 408
         Top = 49
-        Width = 184
+        Width = 277
         Height = 44
         Anchors = [akLeft, akTop, akRight]
         Lines.Strings = (
@@ -344,7 +344,7 @@ object frmTableEditor: TfrmTableEditor
       object comboInsertMethod: TComboBox
         Left = 408
         Top = 95
-        Width = 184
+        Width = 277
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -362,7 +362,7 @@ object frmTableEditor: TfrmTableEditor
       object comboCollation: TComboBox
         Left = 408
         Top = 3
-        Width = 65
+        Width = 158
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -373,7 +373,7 @@ object frmTableEditor: TfrmTableEditor
       object comboEngine: TComboBox
         Left = 408
         Top = 26
-        Width = 184
+        Width = 277
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -381,7 +381,7 @@ object frmTableEditor: TfrmTableEditor
         OnSelect = comboEngineSelect
       end
       object chkCharsetConvert: TCheckBox
-        Left = 481
+        Left = 574
         Top = 5
         Width = 107
         Height = 17
@@ -394,15 +394,11 @@ object frmTableEditor: TfrmTableEditor
     object tabIndexes: TTabSheet
       Caption = 'Indexes'
       ImageIndex = 13
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object treeIndexes: TVirtualStringTree
         AlignWithMargins = True
         Left = 69
         Top = 0
-        Width = 521
+        Width = 614
         Height = 121
         Margins.Top = 0
         Margins.Bottom = 0
@@ -435,7 +431,7 @@ object frmTableEditor: TfrmTableEditor
           item
             Options = [coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
             Position = 0
-            Width = 341
+            Width = 430
             WideText = 'Name'
           end
           item
@@ -750,7 +746,7 @@ object frmTableEditor: TfrmTableEditor
     AlignWithMargins = True
     Left = 3
     Top = 161
-    Width = 601
+    Width = 694
     Height = 22
     Margins.Top = 0
     Margins.Bottom = 0
@@ -762,9 +758,9 @@ object frmTableEditor: TfrmTableEditor
     TabOrder = 1
     object tlbColumns: TToolBar
       AlignWithMargins = True
-      Left = 0
+      Left = 100
       Top = 0
-      Width = 501
+      Width = 594
       Height = 22
       Margins.Left = 100
       Margins.Top = 0
diff --git a/source/trigger_editor.dfm b/source/trigger_editor.dfm
index 26941228..2416dde1 100644
--- a/source/trigger_editor.dfm
+++ b/source/trigger_editor.dfm
@@ -1,12 +1,12 @@
 object frmTriggerEditor: TfrmTriggerEditor
   Left = 0
   Top = 0
-  Width = 477
-  Height = 332
+  Width = 700
+  Height = 500
   TabOrder = 0
   DesignSize = (
-    477
-    332)
+    700
+    500)
   object lblBody: TLabel
     Left = 3
     Top = 141
@@ -17,8 +17,8 @@ object frmTriggerEditor: TfrmTriggerEditor
   object SynMemoBody: TSynMemo
     Left = 3
     Top = 160
-    Width = 471
-    Height = 138
+    Width = 694
+    Height = 306
     SingleLineMode = False
     Anchors = [akLeft, akTop, akRight, akBottom]
     Font.Charset = DEFAULT_CHARSET
@@ -39,7 +39,7 @@ object frmTriggerEditor: TfrmTriggerEditor
   end
   object btnHelp: TButton
     Left = 3
-    Top = 304
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -49,7 +49,7 @@ object frmTriggerEditor: TfrmTriggerEditor
   end
   object btnDiscard: TButton
     Left = 84
-    Top = 304
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -59,7 +59,7 @@ object frmTriggerEditor: TfrmTriggerEditor
   end
   object btnSave: TButton
     Left = 165
-    Top = 304
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -72,7 +72,7 @@ object frmTriggerEditor: TfrmTriggerEditor
     AlignWithMargins = True
     Left = 3
     Top = 3
-    Width = 471
+    Width = 694
     Height = 132
     ActivePage = tabOptions
     Align = alTop
@@ -82,7 +82,7 @@ object frmTriggerEditor: TfrmTriggerEditor
       Caption = 'Options'
       ImageIndex = 39
       DesignSize = (
-        463
+        686
         103)
       object lblDefiner: TLabel
         Left = 247
@@ -116,7 +116,7 @@ object frmTriggerEditor: TfrmTriggerEditor
       object comboDefiner: TComboBox
         Left = 304
         Top = 3
-        Width = 156
+        Width = 379
         Height = 21
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 0
@@ -137,7 +137,7 @@ object frmTriggerEditor: TfrmTriggerEditor
       object comboTable: TComboBox
         Left = 84
         Top = 30
-        Width = 376
+        Width = 599
         Height = 21
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
diff --git a/source/view.dfm b/source/view.dfm
index a0df92ed..2d4e8440 100644
--- a/source/view.dfm
+++ b/source/view.dfm
@@ -1,12 +1,12 @@
 object frmView: TfrmView
   Left = 0
   Top = 0
-  Width = 451
-  Height = 304
+  Width = 700
+  Height = 500
   TabOrder = 0
   DesignSize = (
-    451
-    304)
+    700
+    500)
   object lblName: TLabel
     Left = 3
     Top = 6
@@ -23,8 +23,8 @@ object frmView: TfrmView
   end
   object lblDisabledWhy: TLabel
     Left = 280
-    Top = 276
-    Width = 167
+    Top = 472
+    Width = 416
     Height = 25
     Anchors = [akLeft, akRight, akBottom]
     AutoSize = False
@@ -66,8 +66,8 @@ object frmView: TfrmView
   object SynMemoBody: TSynMemo
     Left = 3
     Top = 143
-    Width = 444
-    Height = 128
+    Width = 693
+    Height = 324
     SingleLineMode = False
     Anchors = [akLeft, akTop, akRight, akBottom]
     Font.Charset = DEFAULT_CHARSET
@@ -104,7 +104,7 @@ object frmView: TfrmView
   end
   object btnDiscard: TButton
     Left = 84
-    Top = 276
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -114,7 +114,7 @@ object frmView: TfrmView
   end
   object btnSave: TButton
     Left = 162
-    Top = 276
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -126,7 +126,7 @@ object frmView: TfrmView
   object rgCheck: TRadioGroup
     Left = 215
     Top = 32
-    Width = 232
+    Width = 481
     Height = 86
     Anchors = [akLeft, akTop, akRight]
     Caption = 'Check option for updates'
@@ -140,7 +140,7 @@ object frmView: TfrmView
   end
   object btnHelp: TButton
     Left = 3
-    Top = 276
+    Top = 472
     Width = 75
     Height = 25
     Anchors = [akLeft, akBottom]
@@ -151,7 +151,7 @@ object frmView: TfrmView
   object comboDefiner: TComboBox
     Left = 280
     Top = 3
-    Width = 167
+    Width = 416
     Height = 21
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 1