diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 5a5bfbb3f..c5bf881da 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -1,11 +1,11 @@
 object DlgEventEdit: TDlgEventEdit
   Left = 417
-  Height = 388
+  Height = 422
   Top = 211
   Width = 697
   BorderStyle = bsToolWindow
   Caption = 'Add / Edit Events'
-  ClientHeight = 388
+  ClientHeight = 422
   ClientWidth = 697
   Constraints.MinHeight = 378
   Constraints.MinWidth = 594
@@ -16,13 +16,13 @@ object DlgEventEdit: TDlgEventEdit
   object ButtonPanel: TPanel
     Left = 0
     Height = 36
-    Top = 352
+    Top = 386
     Width = 697
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 36
     ClientWidth = 697
-    TabOrder = 2
+    TabOrder = 0
     object ResourceNameLbl: TLabel
       Left = 8
       Height = 16
@@ -62,486 +62,506 @@ object DlgEventEdit: TDlgEventEdit
       TabStop = False
     end
   end
-  object AppointmentGroupBox: TGroupBox
-    Left = 8
-    Height = 218
-    Top = 5
-    Width = 679
-    Anchors = [akTop, akLeft, akRight]
-    Caption = 'Appointment'
-    ClientHeight = 198
-    ClientWidth = 675
-    TabOrder = 0
-    object DescriptionLbl: TLabel
-      Left = 5
-      Height = 15
-      Top = 15
-      Width = 63
-      Caption = 'Description:'
-      ParentColor = False
-    end
-    object Bevel1: TBevel
+  object Panel1: TPanel
+    Left = 0
+    Height = 386
+    Top = 0
+    Width = 697
+    Align = alClient
+    BevelOuter = bvNone
+    BorderWidth = 8
+    ClientHeight = 386
+    ClientWidth = 697
+    TabOrder = 1
+    object AppointmentGroupBox: TGroupBox
       Left = 8
-      Height = 2
-      Top = 70
-      Width = 659
-      Anchors = [akTop, akLeft, akRight]
-      Shape = bsTopLine
-    end
-    object Bevel2: TBevel
-      Left = 8
-      Height = 2
-      Top = 160
-      Width = 659
-      Anchors = [akTop, akLeft, akRight]
-      Shape = bsTopLine
-    end
-    object CategoryLbl: TLabel
-      Left = 403
-      Height = 15
-      Top = 43
-      Width = 51
-      Caption = 'Category:'
-      ParentColor = False
-    end
-    object StartTimeLbl: TLabel
-      Left = 33
-      Height = 15
-      Top = 108
-      Width = 54
-      Alignment = taRightJustify
-      Caption = 'Start time:'
-      ParentColor = False
-    end
-    object EndTimeLbl: TLabel
-      Left = 35
-      Height = 15
-      Top = 135
-      Width = 50
-      Alignment = taRightJustify
-      Caption = 'End time:'
-      ParentColor = False
-    end
-    object ImgRecurring: TImage
-      Left = 368
-      Height = 18
-      Top = 81
-      Width = 18
-      Picture.Data = {
-        1754506F727461626C654E6574776F726B477261706869637802000089504E47
-        0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000002
-        3F4944415478DA8D93DB4BD3611CC607FB336276D09242BAB042D639CB642D4F
-        6406AD365FD774E4A18165CEC59AFEDCDCA11DDC49CDB161494625FCC0688465
-        B58D0DD761F923E8DA3B11BC0DEF9EBE1B5D38FD61BB786FDEC3F33CEFF3E12B
-        0120F9DFBAF1BC71B0655A21153B939422D034552F28C62F447615E8FBAC95DD
-        5DD418746F5571CD7CDBFACD17CDB81655A2215C07FDCB76743C53E1A4F9B84F
-        54A077A943AE7FAFE6B9A411FEAC03919F4144574298CAF910FCFA04DEE5318C
-        A52C680D35A2AAB772B448A0E743BBACEBDD2DDEB36CC5ECAF694CFEF0E269CE
-        8FD037377C593B5C690ED694198FBF1871D55D8F83BA03CE22018A6C307F7A80
-        196112915C10EE8C0DBA3935CEDBE4F9C8383670144D3E05AEB8EA50A1DD17D8
-        F105F5EBD6B8236929383A531C2EB9CEAC9EE56ADC5B2F5576960BE56C6F4CB4
-        C4EB330D6BD4F226B5FCA7D67E6AE3B4E504B7FDD27E4D99A94CB5474A668C90
-        3242CA94818B8CCC98845A66973DE718456614995164D69FEE921A12774CDB85
-        C88C23B38D7F669B64B626CA9D90C608A9B0758F90BAC96CD593B611153B0616
-        EEE5FB89EF784C4803D68C09C38987A0C8A0C8A0C8E87EA3852BC915903AD223
-        689B68CE2335143D26A44E2E65C4DCEF6801694C9828423A92182A20D5CEDEC6
-        91EE433C2195150910D2D1471FFB115B09179086BF7B319E75C295B162786908
-        3DF33AB4F89538ACAFE009A95C741628B2AF8FEF84FE15CB230521458DA91AD5
-        F7ABD629729C901A08A96CD761CA0F0EB52C943268A29B84544A48074B11F80B
-        84AC88992D6E2B460000000049454E44AE426082
-      }
-    end
-    object RecurringLbl: TLabel
-      Left = 395
-      Height = 15
-      Top = 85
-      Width = 136
-      Caption = 'Appointment Recurrence:'
-      ParentColor = False
-    end
-    object Bevel3: TBevel
-      Left = 350
-      Height = 76
-      Top = 78
-      Width = 2
-      Shape = bsLeftLine
-    end
-    object IntervalLbl: TLabel
-      Left = 583
-      Height = 15
-      Top = 84
-      Width = 77
-      Caption = 'Interval (days):'
-      ParentColor = False
-    end
-    object ImgAlarm: TImage
-      Left = 13
-      Height = 25
-      Top = 168
-      Width = 23
-      Picture.Data = {
-        1754506F727461626C654E6574776F726B47726170686963E002000089504E47
-        0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000002
-        A74944415478DA95925B48D36118C685AE82826E0A821D6DFB5B6E2D4FA98545
-        9AB5B28BA0A88CF04282A80B233148C5B26645782A47A6094B4971289B9339E7
-        D40DE9346613358F9B3A9B5BDA0E364F34B5914FDF028751665D3CF07DF03EBF
-        EF7DDFEF090210F43F1A69A2548372AECF501AACF0DF373628A9ED2625154A8C
-        DB4C4A6E9E5515017773225AF2D8BE0D019616EA3931DA8615D41C79F5BB4DBD
-        1FFAC7EC157D111FF21C56D3BA0062E48EAAA945674F1A965C5A2C3B5B31DB95
-        0E57533C06CAC3A0CC65E5AED6FEC97CD6DA7100EEA17C7C73A931D77D1E9E37
-        09702A787034C6C0A1390AB58865FA0D408C3B89DAA78CC958B0D661C9FE1273
-        C624CCBC8DC7B4EE20DC9A48B85402B8B427D155CCF10500A32A8A4B8C5364D6
-        1577FF1DF8668DF86AB90FB75E08A7EE30269B633056BB1776191FCE46D245EB
-        09743C085E0E0086E55CADBBEF1C961D12782732E135A562B1FF0C5CAFE2315A
-        1F8EA14A1E3E9451B04A437E8E31A53E8EC66C962D00E8ABE24CCE5BAE61DE22
-        C2FB1A3E7AEB433158178D3122A7261AC6120EBA9FEC82BD960377DB314CC8E2
-        507793290B003A9F06578CA8E2E031E760A0E13454F762A1131F81B6808D8F32
-        013CAD61E813B3619130E1684944CF331E6AAE3384BF2CF175315BDF238D205D
-        6443714B00AFB5105F7A33A1C9E7A3B3888199668A0058641F2440B7D99EB5BF
-        1638B43D649B0D55E130BCB880715D06BCE3228CA82EA224652B7477776041C9
-        85ADE110A43798837F04F84502D2A02BDE87B6C258283279D09725A0F4D2163C
-        4ADA8C6E310D166914AAAED227D605F825CF6609E5594CE849E2EC8653F8FC4E
-        0883640F3EA977A3B74C808ACBF4CEBF025625CD608AA4E90CE80A78305747C1
-        5C1989A6AC1094A6D044FF04F0AB3A8DB14972859E539E4A778A5368D325C9B4
-        7671328DB5B6E607EA5FBE1E3353EA940000000049454E44AE426082
-      }
-    end
-    object SoundFinderBtn: TSpeedButton
-      Left = 312
-      Height = 22
-      Top = 167
-      Width = 23
-      Glyph.Data = {
-        F6000000424DF600000000000000760000002800000010000000100000000100
-        0400000000008000000000000000000000001000000010000000000000000000
-        8000008000000080800080000000800080008080000080808000C0C0C0000000
-        FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00888888888888
-        8888888888000888888888888080808888088888080880888088888080888808
-        0888880880888808888800888008880888880888808088080000088880808808
-        8888008880088808888888088088880808888880808888088088888808088088
-        8808888880808088888888888800088888888888888888888888
-      }
-      OnClick = SoundFinderBtnClick
-    end
-    object imgClock: TImage
-      Left = 13
-      Height = 16
-      Top = 80
-      Width = 16
-      AutoSize = True
-      Picture.Data = {
-        1754506F727461626C654E6574776F726B477261706869633D03000089504E47
-        0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000003
-        044944415478DA5D936B48537118C60F8104117D8BFA12047D90280AA21B4581
-        10154141D0876E064117AA85589695561B6499599999A899B7D5A495D37476B7
-        ADE33CBACCE65A9AA7990B97E5DAE62EC7637A747B7AFF434775E0777878DFE7
-        79FE9C3F1C0E0037DCC84D23D4849D78474C67F3BFA1D99CC9BD95489C9A7301
-        039740E40CB7EFF9AEF84C08B5EFF558EBB75AD25E2B66C23F89B9AD7E3B1FB6
-        1DF18D7467FAC96F25E6C50A3CD55C46C89A3C3036D8086FEBFEC07BFD1A29DB
-        E24341BB07F73A7FC660FA06DF874EFD3239E8D0C852E7C95F94EB2012387705
-        773E6CCFF40F36EF0F08F7D78CE7B7F6E3A1FD0774FC37141ABA90FFA80B154D
-        7DD0D9BEA3ECAD099FEB374546DC8F2606EB168A944DE4BE1673EB7A4A66882D
-        A54BE41C531FAAADFD30985CE87587E00B49F0868621F687A07DD98BB266171E
-        3EC9855DB77AB4BB64D607CA26C62E22ED5EC3B5F41A074A2C2EE8E934F60C05
-        83F832F013BF4933A4285064EC45A1D9890B7A1E47CB85ACD81DB0D79EE20EF3
-        A9C70E143D13D14D27CBE35148B28C3B65E5F05051787414352FDE80FF12C415
-        FD47302FCBC40B76E4F1FE54DD075C7D60876744C1D0680463B438ABD6E0BEE1
-        09D22F6AF052B0C2115470A2D00AE6659978C1B62BCFFC874AAD5097DBD02F29
-        5412813B18C6A5DCEBB1306FFB08EF38F0DEA7E0785E2B989765E2059B2F3C36
-        EFBC698246DB81B7CE207ED047BBC30A9E9A5BD0E70F61700270C940EDA7004E
-        14B7817959265E9074AA52BD455D8794BB02B2F522BC7461430A108E10A40354
-        E0257D4E2B4255CC837959265EB0F678E172A26BE3F906A492E1AABE07365700
-        12DD87242BB093CEAAFE0C55C11B300FF3B24CBC80B1F260EEE123D95A79C399
-        5AECCB7D85D4DB3CD26E59907AB319AA3C1392739E63D765230E6455CACC1BFF
-        17A6842008490E87034D267E62EDB152AC50E9B02AC51083E92DA72BD16C6989
-        B6084294BCEBFF29301A8DB309C9E974A2BEA1C1BF7477A666F1CE0C33E19F84
-        6935EDC2A22882BCE3C48278415555D54CA287182316FDFF2B4F41BBF9449018
-        20E6B2D91FE7D3E5DB1129EAA60000000049454E44AE426082
-      }
-    end
-    object RecurrenceEndsLbl: TLabel
-      Left = 424
-      Height = 15
-      Top = 135
-      Width = 28
-      Alignment = taRightJustify
-      Caption = 'Until:'
-      ParentColor = False
-    end
-    object DescriptionEdit: TEdit
-      Left = 86
-      Height = 23
-      Top = 11
-      Width = 578
-      Anchors = [akTop, akLeft, akRight]
+      Height = 224
+      Top = 8
+      Width = 681
+      Align = alTop
+      Caption = 'Appointment'
+      ClientHeight = 204
+      ClientWidth = 677
       TabOrder = 0
-      Text = 'DescriptionEdit'
+      object DescriptionLbl: TLabel
+        Left = 5
+        Height = 15
+        Top = 15
+        Width = 63
+        Caption = 'Description:'
+        ParentColor = False
+      end
+      object Bevel1: TBevel
+        Left = 8
+        Height = 2
+        Top = 70
+        Width = 661
+        Anchors = [akTop, akLeft, akRight]
+        Shape = bsTopLine
+      end
+      object Bevel2: TBevel
+        Left = 8
+        Height = 2
+        Top = 160
+        Width = 661
+        Anchors = [akTop, akLeft, akRight]
+        Shape = bsTopLine
+      end
+      object CategoryLbl: TLabel
+        Left = 403
+        Height = 15
+        Top = 43
+        Width = 51
+        Caption = 'Category:'
+        ParentColor = False
+      end
+      object StartTimeLbl: TLabel
+        Left = 33
+        Height = 15
+        Top = 108
+        Width = 54
+        Alignment = taRightJustify
+        Caption = 'Start time:'
+        ParentColor = False
+      end
+      object EndTimeLbl: TLabel
+        Left = 35
+        Height = 15
+        Top = 135
+        Width = 50
+        Alignment = taRightJustify
+        Caption = 'End time:'
+        ParentColor = False
+      end
+      object ImgRecurring: TImage
+        Left = 368
+        Height = 18
+        Top = 81
+        Width = 18
+        Picture.Data = {
+          1754506F727461626C654E6574776F726B477261706869637802000089504E47
+          0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000002
+          3F4944415478DA8D93DB4BD3611CC607FB336276D09242BAB042D639CB642D4F
+          6406AD365FD774E4A18165CEC59AFEDCDCA11DDC49CDB161494625FCC0688465
+          B58D0DD761F923E8DA3B11BC0DEF9EBE1B5D38FD61BB786FDEC3F33CEFF3E12B
+          0120F9DFBAF1BC71B0655A21153B939422D034552F28C62F447615E8FBAC95DD
+          5DD418746F5571CD7CDBFACD17CDB81655A2215C07FDCB76743C53E1A4F9B84F
+          54A077A943AE7FAFE6B9A411FEAC03919F4144574298CAF910FCFA04DEE5318C
+          A52C680D35A2AAB772B448A0E743BBACEBDD2DDEB36CC5ECAF694CFEF0E269CE
+          8FD037377C593B5C690ED694198FBF1871D55D8F83BA03CE22018A6C307F7A80
+          196112915C10EE8C0DBA3935CEDBE4F9C8383670144D3E05AEB8EA50A1DD17D8
+          F105F5EBD6B8236929383A531C2EB9CEAC9EE56ADC5B2F5576960BE56C6F4CB4
+          C4EB330D6BD4F226B5FCA7D67E6AE3B4E504B7FDD27E4D99A94CB5474A668C90
+          3242CA94818B8CCC98845A66973DE718456614995164D69FEE921A12774CDB85
+          C88C23B38D7F669B64B626CA9D90C608A9B0758F90BAC96CD593B611153B0616
+          EEE5FB89EF784C4803D68C09C38987A0C8A0C8A0C8E87EA3852BC915903AD223
+          689B68CE2335143D26A44E2E65C4DCEF6801694C9828423A92182A20D5CEDEC6
+          91EE433C2195150910D2D1471FFB115B09179086BF7B319E75C295B162786908
+          3DF33AB4F89538ACAFE009A95C741628B2AF8FEF84FE15CB230521458DA91AD5
+          F7ABD629729C901A08A96CD761CA0F0EB52C943268A29B84544A48074B11F80B
+          84AC88992D6E2B460000000049454E44AE426082
+        }
+      end
+      object RecurringLbl: TLabel
+        Left = 395
+        Height = 15
+        Top = 85
+        Width = 136
+        Caption = 'Appointment Recurrence:'
+        ParentColor = False
+      end
+      object Bevel3: TBevel
+        Left = 350
+        Height = 76
+        Top = 78
+        Width = 2
+        Shape = bsLeftLine
+      end
+      object IntervalLbl: TLabel
+        Left = 583
+        Height = 15
+        Top = 84
+        Width = 77
+        Caption = 'Interval (days):'
+        ParentColor = False
+      end
+      object ImgAlarm: TImage
+        Left = 13
+        Height = 25
+        Top = 168
+        Width = 23
+        Picture.Data = {
+          1754506F727461626C654E6574776F726B47726170686963E002000089504E47
+          0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000002
+          A74944415478DA95925B48D36118C685AE82826E0A821D6DFB5B6E2D4FA98545
+          9AB5B28BA0A88CF04282A80B233148C5B26645782A47A6094B4971289B9339E7
+          D40DE9346613358F9B3A9B5BDA0E364F34B5914FDF028751665D3CF07DF03EBF
+          EF7DDFEF090210F43F1A69A2548372AECF501AACF0DF373628A9ED2625154A8C
+          DB4C4A6E9E5515017773225AF2D8BE0D019616EA3931DA8615D41C79F5BB4DBD
+          1FFAC7EC157D111FF21C56D3BA0062E48EAAA945674F1A965C5A2C3B5B31DB95
+          0E57533C06CAC3A0CC65E5AED6FEC97CD6DA7100EEA17C7C73A931D77D1E9E37
+          09702A787034C6C0A1390AB58865FA0D408C3B89DAA78CC958B0D661C9FE1273
+          C624CCBC8DC7B4EE20DC9A48B85402B8B427D155CCF10500A32A8A4B8C5364D6
+          1577FF1DF8668DF86AB90FB75E08A7EE30269B633056BB1776191FCE46D245EB
+          09743C085E0E0086E55CADBBEF1C961D12782732E135A562B1FF0C5CAFE2315A
+          1F8EA14A1E3E9451B04A437E8E31A53E8EC66C962D00E8ABE24CCE5BAE61DE22
+          C2FB1A3E7AEB433158178D3122A7261AC6120EBA9FEC82BD960377DB314CC8E2
+          507793290B003A9F06578CA8E2E031E760A0E13454F762A1131F81B6808D8F32
+          013CAD61E813B3619130E1684944CF331E6AAE3384BF2CF175315BDF238D205D
+          6443714B00AFB5105F7A33A1C9E7A3B3888199668A0058641F2440B7D99EB5BF
+          1638B43D649B0D55E130BCB880715D06BCE3228CA82EA224652B7477776041C9
+          85ADE110A43798837F04F84502D2A02BDE87B6C258283279D09725A0F4D2163C
+          4ADA8C6E310D166914AAAED227D605F825CF6609E5594CE849E2EC8653F8FC4E
+          0883640F3EA977A3B74C808ACBF4CEBF025625CD608AA4E90CE80A78305747C1
+          5C1989A6AC1094A6D044FF04F0AB3A8DB14972859E539E4A778A5368D325C9B4
+          7671328DB5B6E607EA5FBE1E3353EA940000000049454E44AE426082
+        }
+      end
+      object SoundFinderBtn: TSpeedButton
+        Left = 328
+        Height = 22
+        Top = 167
+        Width = 23
+        Glyph.Data = {
+          F6000000424DF600000000000000760000002800000010000000100000000100
+          0400000000008000000000000000000000001000000010000000000000000000
+          8000008000000080800080000000800080008080000080808000C0C0C0000000
+          FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00888888888888
+          8888888888000888888888888080808888088888080880888088888080888808
+          0888880880888808888800888008880888880888808088080000088880808808
+          8888008880088808888888088088880808888880808888088088888808088088
+          8808888880808088888888888800088888888888888888888888
+        }
+        OnClick = SoundFinderBtnClick
+      end
+      object imgClock: TImage
+        Left = 13
+        Height = 16
+        Top = 80
+        Width = 16
+        AutoSize = True
+        Picture.Data = {
+          1754506F727461626C654E6574776F726B477261706869633D03000089504E47
+          0D0A1A0A0000000D49484452000000100000001008060000001FF3FF61000003
+          044944415478DA5D936B48537118C60F8104117D8BFA12047D90280AA21B4581
+          10154141D0876E064117AA85589695561B6499599999A899B7D5A495D37476B7
+          ADE33CBACCE65A9AA7990B97E5DAE62EC7637A747B7AFF434775E0777878DFE7
+          79FE9C3F1C0E0037DCC84D23D4849D78474C67F3BFA1D99CC9BD95489C9A7301
+          039740E40CB7EFF9AEF84C08B5EFF558EBB75AD25E2B66C23F89B9AD7E3B1FB6
+          1DF18D7467FAC96F25E6C50A3CD55C46C89A3C3036D8086FEBFEC07BFD1A29DB
+          E24341BB07F73A7FC660FA06DF874EFD3239E8D0C852E7C95F94EB2012387705
+          773E6CCFF40F36EF0F08F7D78CE7B7F6E3A1FD0774FC37141ABA90FFA80B154D
+          7DD0D9BEA3ECAD099FEB374546DC8F2606EB168A944DE4BE1673EB7A4A66882D
+          A54BE41C531FAAADFD30985CE87587E00B49F0868621F687A07DD98BB266171E
+          3EC9855DB77AB4BB64D607CA26C62E22ED5EC3B5F41A074A2C2EE8E934F60C05
+          83F832F013BF4933A4285064EC45A1D9890B7A1E47CB85ACD81DB0D79EE20EF3
+          A9C70E143D13D14D27CBE35148B28C3B65E5F05051787414352FDE80FF12C415
+          FD47302FCBC40B76E4F1FE54DD075C7D60876744C1D0680463B438ABD6E0BEE1
+          09D22F6AF052B0C2115470A2D00AE6659978C1B62BCFFC874AAD5097DBD02F29
+          5412813B18C6A5DCEBB1306FFB08EF38F0DEA7E0785E2B989765E2059B2F3C36
+          EFBC698246DB81B7CE207ED047BBC30A9E9A5BD0E70F61700270C940EDA7004E
+          14B7817959265E9074AA52BD455D8794BB02B2F522BC7461430A108E10A40354
+          E0257D4E2B4255CC837959265EB0F678E172A26BE3F906A492E1AABE07365700
+          12DD87242BB093CEAAFE0C55C11B300FF3B24CBC80B1F260EEE123D95A79C399
+          5AECCB7D85D4DB3CD26E59907AB319AA3C1392739E63D765230E6455CACC1BFF
+          17A6842008490E87034D267E62EDB152AC50E9B02AC51083E92DA72BD16C6989
+          B6084294BCEBFF29301A8DB309C9E974A2BEA1C1BF7477A666F1CE0C33E19F84
+          6935EDC2A22882BCE3C48278415555D54CA287182316FDFF2B4F41BBF9449018
+          20E6B2D91FE7D3E5DB1129EAA60000000049454E44AE426082
+        }
+      end
+      object RecurrenceEndsLbl: TLabel
+        Left = 424
+        Height = 15
+        Top = 135
+        Width = 28
+        Alignment = taRightJustify
+        Caption = 'Until:'
+        ParentColor = False
+      end
+      object DescriptionEdit: TEdit
+        Left = 86
+        Height = 23
+        Top = 11
+        Width = 580
+        Anchors = [akTop, akLeft, akRight]
+        TabOrder = 0
+        Text = 'DescriptionEdit'
+      end
+      object AlarmSet: TCheckBox
+        Left = 38
+        Height = 19
+        Top = 170
+        Width = 74
+        Caption = '&Reminder:'
+        OnClick = AlarmSetClick
+        TabOrder = 10
+      end
+      object Category: TComboBox
+        Left = 484
+        Height = 23
+        Top = 40
+        Width = 180
+        ItemHeight = 15
+        OnDrawItem = CategoryDrawItem
+        TabOrder = 2
+      end
+      object RecurringType: TComboBox
+        Left = 395
+        Height = 23
+        Top = 104
+        Width = 171
+        ItemHeight = 15
+        OnChange = RecurringTypeChange
+        Style = csDropDownList
+        TabOrder = 6
+      end
+      object IntervalUpDown: TUpDown
+        Left = 648
+        Height = 23
+        Top = 104
+        Width = 16
+        Associate = edtUnusedPlaceholder
+        Max = 32767
+        Min = 0
+        OnClick = IntervalUpDownClick
+        Position = 0
+        TabOrder = 8
+        Wrap = False
+      end
+      object AlarmAdvanceType: TComboBox
+        Left = 231
+        Height = 23
+        Top = 167
+        Width = 93
+        ItemHeight = 15
+        Style = csDropDownList
+        TabOrder = 13
+      end
+      object AdvanceUpDown: TUpDown
+        Left = 194
+        Height = 23
+        Top = 168
+        Width = 14
+        Associate = AlarmAdvance
+        Max = 120
+        Min = 1
+        OnClick = AdvanceUpDownClick
+        Position = 1
+        TabOrder = 12
+        Wrap = False
+      end
+      object CBAllDay: TCheckBox
+        Left = 86
+        Height = 19
+        Top = 80
+        Width = 89
+        Caption = 'All Day Event'
+        OnClick = CBAllDayClick
+        TabOrder = 3
+      end
+      object edtUnusedPlaceholder: TEdit
+        Left = 583
+        Height = 23
+        Top = 104
+        Width = 65
+        TabOrder = 7
+        Text = 'Placeholder control'
+        Visible = False
+      end
+      object StartDate: TDateEdit
+        Left = 104
+        Height = 23
+        Top = 104
+        Width = 104
+        CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+        OKCaption = 'OK'
+        CancelCaption = 'Cancel'
+        DateOrder = doNone
+        ButtonWidth = 23
+        Glyph.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
+          72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
+          52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
+          75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
+          C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
+          7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
+          ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
+          7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
+          B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
+          82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
+          BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
+          87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
+          75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
+          8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
+          73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
+          8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
+          71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
+          94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
+          ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
+          98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
+          FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
+          9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
+          FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
+          9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
+          FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
+          A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
+          F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
+          A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
+          8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+        }
+        NumGlyphs = 1
+        MaxLength = 0
+        TabOrder = 4
+      end
+      object EndDate: TDateEdit
+        Left = 104
+        Height = 23
+        Top = 131
+        Width = 104
+        CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+        OKCaption = 'OK'
+        CancelCaption = 'Cancel'
+        DateOrder = doNone
+        ButtonWidth = 23
+        Glyph.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
+          72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
+          52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
+          75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
+          C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
+          7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
+          ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
+          7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
+          B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
+          82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
+          BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
+          87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
+          75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
+          8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
+          73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
+          8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
+          71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
+          94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
+          ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
+          98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
+          FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
+          9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
+          FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
+          9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
+          FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
+          A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
+          F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
+          A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
+          8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+        }
+        NumGlyphs = 1
+        MaxLength = 0
+        TabOrder = 5
+      end
+      object RepeatUntil: TDateEdit
+        Left = 464
+        Height = 23
+        Top = 131
+        Width = 100
+        CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+        OKCaption = 'OK'
+        CancelCaption = 'Cancel'
+        DateOrder = doNone
+        ButtonWidth = 23
+        Glyph.Data = {
+          36040000424D3604000000000000360000002800000010000000100000000100
+          2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
+          72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
+          52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
+          75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
+          C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
+          7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
+          ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
+          7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
+          B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
+          82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
+          BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
+          87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
+          75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
+          8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
+          73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
+          8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
+          71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
+          94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
+          ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
+          98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
+          FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
+          9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
+          FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
+          9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
+          FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
+          A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
+          F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
+          A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
+          8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+          FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+        }
+        NumGlyphs = 1
+        MaxLength = 0
+        TabOrder = 9
+      end
+      object AlarmAdvance: TEdit
+        Left = 136
+        Height = 23
+        Top = 168
+        Width = 58
+        OnChange = AlarmAdvanceChange
+        TabOrder = 11
+        Text = 'AlarmAdvance'
+      end
+      object LocationLbl: TLabel
+        Left = 5
+        Height = 15
+        Top = 43
+        Width = 49
+        Caption = 'Location:'
+        FocusControl = LocationEdit
+        ParentColor = False
+      end
+      object LocationEdit: TEdit
+        Left = 86
+        Height = 23
+        Top = 39
+        Width = 235
+        TabOrder = 1
+      end
     end
-    object AlarmSet: TCheckBox
-      Left = 38
-      Height = 19
-      Top = 170
-      Width = 74
-      Caption = '&Reminder:'
-      OnClick = AlarmSetClick
-      TabOrder = 10
-    end
-    object Category: TComboBox
-      Left = 484
-      Height = 23
-      Top = 40
-      Width = 180
-      ItemHeight = 15
-      OnDrawItem = CategoryDrawItem
-      TabOrder = 2
-    end
-    object RecurringType: TComboBox
-      Left = 395
-      Height = 23
-      Top = 104
-      Width = 171
-      ItemHeight = 15
-      OnChange = RecurringTypeChange
-      Style = csDropDownList
-      TabOrder = 6
-    end
-    object IntervalUpDown: TUpDown
-      Left = 648
-      Height = 23
-      Top = 104
-      Width = 16
-      Associate = edtUnusedPlaceholder
-      Max = 32767
-      Min = 0
-      OnClick = IntervalUpDownClick
-      Position = 0
-      TabOrder = 8
-      Wrap = False
-    end
-    object AlarmAdvanceType: TComboBox
-      Left = 231
-      Height = 23
-      Top = 167
-      Width = 77
-      ItemHeight = 15
-      Style = csDropDownList
-      TabOrder = 13
-    end
-    object AdvanceUpDown: TUpDown
-      Left = 194
-      Height = 23
-      Top = 168
-      Width = 14
-      Associate = AlarmAdvance
-      Max = 120
-      Min = 1
-      OnClick = AdvanceUpDownClick
-      Position = 1
-      TabOrder = 12
-      Wrap = False
-    end
-    object CBAllDay: TCheckBox
-      Left = 86
-      Height = 19
-      Top = 80
-      Width = 89
-      Caption = 'All Day Event'
-      OnClick = CBAllDayClick
-      TabOrder = 3
-    end
-    object edtUnusedPlaceholder: TEdit
-      Left = 583
-      Height = 23
-      Top = 104
-      Width = 65
-      TabOrder = 7
-      Text = 'Placeholder control'
-      Visible = False
-    end
-    object StartDate: TDateEdit
-      Left = 104
-      Height = 23
-      Top = 104
-      Width = 104
-      CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
-      OKCaption = 'OK'
-      CancelCaption = 'Cancel'
-      DateOrder = doNone
-      ButtonWidth = 23
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
-        72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
-        52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
-        75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
-        C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
-        7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
-        ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
-        7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
-        B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
-        82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
-        BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
-        87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
-        75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
-        8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
-        73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
-        8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
-        71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
-        94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
-        ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
-        98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
-        FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
-        9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
-        FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
-        9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
-        FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
-        A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
-        F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
-        A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
-        8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-      }
-      NumGlyphs = 1
-      MaxLength = 0
-      TabOrder = 4
-    end
-    object EndDate: TDateEdit
-      Left = 104
-      Height = 23
-      Top = 131
-      Width = 104
-      CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
-      OKCaption = 'OK'
-      CancelCaption = 'Cancel'
-      DateOrder = doNone
-      ButtonWidth = 23
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
-        72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
-        52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
-        75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
-        C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
-        7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
-        ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
-        7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
-        B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
-        82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
-        BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
-        87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
-        75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
-        8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
-        73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
-        8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
-        71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
-        94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
-        ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
-        98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
-        FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
-        9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
-        FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
-        9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
-        FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
-        A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
-        F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
-        A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
-        8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-      }
-      NumGlyphs = 1
-      MaxLength = 0
-      TabOrder = 5
-    end
-    object RepeatUntil: TDateEdit
-      Left = 464
-      Height = 23
-      Top = 131
-      Width = 100
-      CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
-      OKCaption = 'OK'
-      CancelCaption = 'Cancel'
-      DateOrder = doNone
-      ButtonWidth = 23
-      Glyph.Data = {
-        36040000424D3604000000000000360000002800000010000000100000000100
-        2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D69E
-        72C4D3996EF4D19668FFCE9263FFCB8E5EFFC98A5BFFC78756FFC38452FFC384
-        52FFC38452FFC38452FFC38452FFC38452FFBB7742B0FFFFFF00FFFFFF00D7A1
-        75FFF8F2EDFFF7F0EAFFF6EDE6FFF4EAE2FFF3E7DEFFF1E4DBFFF0E2D8FFEAD6
-        C8FFF2E5DCFFFAF4F1FFF9F3F0FFFAF5F2FFC58A5DFDFFFFFF00FFFFFF00D9A4
-        7AFFF9F3EEFFEBD2BEFFFFFFFFFFEBD3BFFFFFFFFFFFEBD3C0FFFFFFFFFFEAC7
-        ADFFECD9CDFFF1E4DBFFF9F3F0FFF9F2EFFFC68C5FFFFFFFFF00FFFFFF00DDA8
-        7EFFF9F3EFFFEBD0BAFFEBD0BBFF75B57AFF75B57AFF75B57AFFEBD1BDFFEACD
-        B5FFFAF4F0FFEBD9CCFFF1E4DBFFFAF4F1FFC68A5CFFFFFFFF00FFFFFF00DFAA
-        82FFF9F3EFFFEACEB7FFFFFFFFFF75B57AFF94D49BFF74B579FFFFFFFFFFEACF
-        BAFFFBF6F2FFFAF3F0FFEBD8CBFFF2E6DDFFC88D5FFFFFFFFF00FFFFFF00E1AE
-        87FFFAF4F0FFEACBB2FFEACCB3FF75B57AFF74B579FF73B478FFEACEB7FF70B3
-        75FF6FB274FF6EB172FFE8C8AEFFEAD7C9FFC48654FFFFFFFF00FFFFFF00E3B1
-        8CFFFAF6F1FFEAC9AEFFFFFFFFFFEAC9B0FFFFFFFFFFE9CBB3FFFFFFFFFF6FB1
-        73FF8ED295FF6BAF6FFFFFFFFFFFF1E5DBFFC68655FFFFFFFF00FFFFFF00E5B4
-        8FFFFAF6F2FFE9C6AAFFE9C6ACFFEAC7ACFFE9C7ADFFE9C9AEFFE9C9B0FF6CB0
-        71FF6AAF6EFF68AD6DFFE8CCB5FFF2E7DEFFC88A59FFFFFFFF00FFFFFF00E7B7
-        94FFFBF7F4FFE9C3A6FFFFFFFFFFE8C4A9FFFFFFFFFFE9C6AAFFFFFFFFFFE8C7
-        ACFFFFFFFFFFE8C8B0FFFFFFFFFFF7F1EBFFCB8F5FFFFFFFFF00FFFFFF00E9BA
-        98FFFBF7F4FF65A4FFFF64A3FFFF62A2FFFF61A1FFFF5F9FFFFF5C9DFFFF5A9A
-        FFFF5798FFFF5495FFFF5294FFFFFBF7F4FFCE9364FFFFFFFF00FFFFFF00EBBD
-        9BFFFBF7F4FF64A4FFFF79BDFFFF75BBFFFF71B9FFFF6DB8FFFF68B3FFFF61B0
-        FFFF5AABFFFF54A7FFFF3B7DFFFFFBF7F4FFD1976AFFFFFFFF00FFFFFF00ECBF
-        9EFFFBF7F4FF65A4FFFF64A3FFFF60A0FFFF5D9EFFFF5899FFFF5496FFFF4D90
-        FFFF478BFFFF4284FFFF3D7FFFFFFBF7F4FFD49B6FFFFFFFFF00FFFFFF00EEC1
-        A1EBFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7
-        F4FFFBF7F4FFFBF7F4FFFBF7F4FFFBF7F4FFD7A074F8FFFFFF00FFFFFF00EFC2
-        A37EEFC1A2E3EDC09FFFEBBE9DFFEBBC9AFFE9BA96FFE7B793FFE6B590FFE4B2
-        8CFFE2AF88FFE0AC84FFDDA980FFDCA57DFFDAA37ACAFFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-      }
-      NumGlyphs = 1
-      MaxLength = 0
-      TabOrder = 9
-    end
-    object AlarmAdvance: TEdit
-      Left = 136
-      Height = 23
-      Top = 168
-      Width = 58
-      OnChange = AlarmAdvanceChange
-      TabOrder = 11
-      Text = 'AlarmAdvance'
-    end
-    object LocationLbl: TLabel
-      Left = 5
-      Height = 15
-      Top = 43
-      Width = 49
-      Caption = 'Location:'
-      FocusControl = LocationEdit
-      ParentColor = False
-    end
-    object LocationEdit: TEdit
-      Left = 86
-      Height = 23
-      Top = 39
-      Width = 235
+    object NotesMemo: TMemo
+      Left = 8
+      Height = 138
+      Top = 240
+      Width = 681
+      Align = alClient
+      ScrollBars = ssVertical
       TabOrder = 1
     end
-  end
-  object NotesMemo: TMemo
-    Left = 8
-    Height = 105
-    Top = 232
-    Width = 679
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    ScrollBars = ssVertical
-    TabOrder = 1
+    object Bevel4: TBevel
+      Left = 8
+      Height = 8
+      Top = 232
+      Width = 681
+      Align = alTop
+      Shape = bsSpacer
+    end
   end
   object FileDialog: TOpenDialog
     left = 320
diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index da5dad605..1012240d9 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -59,9 +59,11 @@ type
 
   TDlgEventEdit = class(TForm)
     AlarmAdvance: TEdit;
+    Bevel4: TBevel;
     LocationEdit: TEdit;
     LocationLbl: TLabel;
     NotesMemo: TMemo;
+    Panel1: TPanel;
     StartDate: TDateEdit;
     EndDate: TDateEdit;
     RepeatUntil: TDateEdit;
@@ -199,8 +201,6 @@ end;
 { TDlgEventEdit }
 
 procedure TDlgEventEdit.FormCreate(Sender: TObject);
-var
-  h: Integer;
 begin
  {$IFDEF LCL}
   StartTime := TTimeEdit.Create(self);
@@ -247,14 +247,6 @@ begin
     TabOrder := edtUnusedPlaceholder.TabOrder;
   end;
   IntervalUpDown.Associate := FCustomInterval;
-
-  // This is needed as workaround for the combobox height at higher dpi.
-  // We design it with Style csDropdown where the height is correct, and then
-  // use the corresponding, correct ItemHeight after switching to csOwnerDrawFixed
-  // (which is needed to draw the color boxes).
-  h := Category.ItemHeight;
-  Category.Style := csOwnerDrawFixed;
-  Category.ItemHeight := h;
 end;
 {=====}
 
@@ -621,8 +613,16 @@ const
   VDIST = 5;
   VBEVELDIST = 8;
 var
-  w: Integer;
+  w, h: Integer;
 begin
+  // This is needed as workaround for the combobox height at higher dpi.
+  // We design it with Style csDropdown where the height is correct, and then
+  // use the corresponding, correct ItemHeight after switching to csOwnerDrawFixed
+  // (which is needed to draw the color boxes).
+  h := Category.ItemHeight;
+  Category.Style := csOwnerDrawFixed;
+  Category.ItemHeight := h+1;
+
   // *** Horizontal positions ***
 
   // Position controls according to label widths
@@ -727,9 +727,17 @@ begin
 
   AppointmentGroupbox.ClientHeight := BottomOf(AlarmAdvance) + VBEVELDIST;
 
-  NotesMemo.Top := BottomOf(AppointmentGroupbox) + VBEVELDIST;
+  OKBtn.Width := Max(GetButtonWidth(OKBtn), GetButtonWidth(CancelBtn));
+  CancelBtn.Width := OKBtn.Width;
+  CancelBtn.Left := ButtonPanel.ClientWidth - ResourcenameLbl.Left - CancelBtn.Width;
+  OKBtn.Left := CancelBtn.Left - DELTA - OKBtn.Width;
+  ResourceNameLbl.Top := (ButtonPanel.ClientHeight - Panel1.BorderWidth - ResourceNameLbl.Height) div 2;
+  OKBtn.Top := (ButtonPanel.ClientHeight - Panel1.BorderWidth - OKBtn.Height) div 2;
+  CancelBtn.Top := OKBtn.Top;
 
-  ClientHeight := BottomOf(NotesMemo) + VBEVELDIST + ButtonPanel.Height;
+//  NotesMemo.Top := BottomOf(AppointmentGroupbox) + VBEVELDIST;
+
+//  ClientHeight := BottomOf(NotesMemo) + VBEVELDIST + ButtonPanel.Height;
 end;