diff --git a/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm b/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
index e7c5dac29..f5db05c4d 100644
--- a/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
+++ b/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
@@ -1,148 +1,171 @@
 object frmReportSetup: TfrmReportSetup
   Left = 380
-  Height = 138
+  Height = 159
   Top = 138
-  Width = 299
+  Width = 308
   BorderStyle = bsDialog
   Caption = 'Report Setup'
-  ClientHeight = 138
-  ClientWidth = 299
+  ClientHeight = 159
+  ClientWidth = 308
   Color = clBtnFace
   Font.Color = clWindowText
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poMainFormCenter
   LCLVersion = '1.6.4.0'
-  object lblStartDate: TLabel
-    AnchorSideTop.Control = edStartDate
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = edStartDate
-    Left = 42
-    Height = 15
-    Top = 12
-    Width = 54
-    Anchors = [akTop, akRight]
-    BorderSpacing.Left = 8
-    BorderSpacing.Right = 8
-    Caption = 'Start Date:'
-    FocusControl = edStartDate
-    ParentColor = False
-  end
-  object lblEndDate: TLabel
-    AnchorSideTop.Control = edEndDate
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = edEndDate
-    Left = 46
-    Height = 15
-    Top = 43
-    Width = 50
-    Anchors = [akTop, akRight]
-    BorderSpacing.Left = 8
-    BorderSpacing.Right = 8
-    Caption = 'End Date:'
-    FocusControl = edEndDate
-    ParentColor = False
-  end
-  object lblFormat: TLabel
-    AnchorSideTop.Control = PrintFormatCombo
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = PrintFormatCombo
-    Left = 55
-    Height = 15
-    Top = 74
-    Width = 41
-    Anchors = [akTop, akRight]
-    BorderSpacing.Left = 8
-    BorderSpacing.Right = 8
-    Caption = 'Format:'
-    FocusControl = PrintFormatCombo
-    ParentColor = False
-  end
-  object btnOK: TButton
-    AnchorSideTop.Control = PrintFormatCombo
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = btnCancel
-    Left = 125
-    Height = 25
-    Top = 105
-    Width = 75
-    Anchors = [akTop, akRight]
-    BorderSpacing.Right = 8
-    BorderSpacing.Bottom = 8
-    Caption = 'OK'
-    Default = True
-    ModalResult = 1
-    TabOrder = 3
-  end
-  object btnCancel: TButton
-    AnchorSideTop.Control = PrintFormatCombo
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 208
-    Height = 25
-    Top = 105
-    Width = 83
-    Anchors = [akTop, akRight]
-    BorderSpacing.Right = 8
-    BorderSpacing.Bottom = 8
-    Cancel = True
-    Caption = 'Cancel'
-    ModalResult = 2
-    TabOrder = 4
-  end
-  object PrintFormatCombo: TVpPrintFormatComboBox
-    AnchorSideLeft.Control = edStartDate
-    AnchorSideTop.Control = edEndDate
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = edStartDate
-    AnchorSideRight.Side = asrBottom
-    Left = 104
-    Height = 23
-    Top = 70
-    Width = 187
-    Anchors = [akTop, akLeft, akRight]
-    Borderspacing.Top = 8
-    Borderspacing.Bottom = 12
-    ItemHeight = 15
-    Sorted = True
-    TabOrder = 2
-  end
-  object edStartDate: TDateEdit
+  object Panel1: TPanel
+    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 104
-    Height = 23
-    Top = 8
-    Width = 187
-    CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
-    DateOrder = doNone
-    ButtonWidth = 23
-    Anchors = [akTop, akRight]
-    BorderSpacing.Top = 8
-    BorderSpacing.Right = 8
-    NumGlyphs = 1
-    MaxLength = 0
+    Left = 0
+    Height = 105
+    Top = 0
+    Width = 265
+    AutoSize = True
+    BevelOuter = bvNone
+    ClientHeight = 105
+    ClientWidth = 265
     TabOrder = 0
+    object lblStartDate: TLabel
+      AnchorSideTop.Control = edStartDate
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = edStartDate
+      Left = 8
+      Height = 15
+      Top = 12
+      Width = 54
+      Anchors = [akTop, akRight]
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
+      Caption = 'Start Date:'
+      FocusControl = edStartDate
+      ParentColor = False
+    end
+    object lblEndDate: TLabel
+      AnchorSideTop.Control = edEndDate
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = edEndDate
+      Left = 12
+      Height = 15
+      Top = 43
+      Width = 50
+      Anchors = [akTop, akRight]
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
+      Caption = 'End Date:'
+      FocusControl = edEndDate
+      ParentColor = False
+    end
+    object lblFormat: TLabel
+      AnchorSideTop.Control = PrintFormatCombo
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = PrintFormatCombo
+      Left = 21
+      Height = 15
+      Top = 74
+      Width = 41
+      Anchors = [akTop, akRight]
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
+      Caption = 'Format:'
+      FocusControl = PrintFormatCombo
+      ParentColor = False
+    end
+    object PrintFormatCombo: TVpPrintFormatComboBox
+      AnchorSideLeft.Control = edStartDate
+      AnchorSideTop.Control = edEndDate
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = edStartDate
+      AnchorSideRight.Side = asrBottom
+      Left = 70
+      Height = 23
+      Top = 70
+      Width = 187
+      Anchors = [akTop, akLeft, akRight]
+      Borderspacing.Top = 8
+      Borderspacing.Bottom = 12
+      ItemHeight = 15
+      Sorted = True
+      TabOrder = 0
+    end
+    object edStartDate: TDateEdit
+      AnchorSideTop.Control = Panel1
+      AnchorSideRight.Control = Panel1
+      AnchorSideRight.Side = asrBottom
+      Left = 70
+      Height = 23
+      Top = 8
+      Width = 187
+      CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+      DateOrder = doNone
+      ButtonWidth = 23
+      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 8
+      NumGlyphs = 1
+      MaxLength = 0
+      TabOrder = 1
+    end
+    object edEndDate: TDateEdit
+      AnchorSideLeft.Control = edStartDate
+      AnchorSideTop.Control = edStartDate
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = edStartDate
+      AnchorSideRight.Side = asrBottom
+      Left = 70
+      Height = 23
+      Top = 39
+      Width = 187
+      CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+      DateOrder = doNone
+      ButtonWidth = 23
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 8
+      NumGlyphs = 1
+      MaxLength = 0
+      TabOrder = 2
+    end
   end
-  object edEndDate: TDateEdit
-    AnchorSideLeft.Control = edStartDate
-    AnchorSideTop.Control = edStartDate
+  object ButtonPanel: TPanel
+    AnchorSideLeft.Control = Panel1
+    AnchorSideTop.Control = Panel1
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = edStartDate
+    AnchorSideRight.Control = Panel1
     AnchorSideRight.Side = asrBottom
-    Left = 104
-    Height = 23
-    Top = 39
-    Width = 187
-    CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
-    DateOrder = doNone
-    ButtonWidth = 23
+    Left = 0
+    Height = 33
+    Top = 105
+    Width = 265
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 8
-    NumGlyphs = 1
-    MaxLength = 0
+    AutoSize = True
+    BevelOuter = bvNone
+    ClientHeight = 33
+    ClientWidth = 265
     TabOrder = 1
+    object btnOK: TButton
+      Left = 91
+      Height = 25
+      Top = 0
+      Width = 75
+      Align = alRight
+      BorderSpacing.Right = 8
+      BorderSpacing.Bottom = 8
+      Caption = 'OK'
+      Default = True
+      ModalResult = 1
+      TabOrder = 0
+    end
+    object btnCancel: TButton
+      Left = 174
+      Height = 25
+      Top = 0
+      Width = 83
+      Align = alRight
+      BorderSpacing.Right = 8
+      BorderSpacing.Bottom = 8
+      Cancel = True
+      Caption = 'Cancel'
+      ModalResult = 2
+      TabOrder = 1
+    end
   end
 end
diff --git a/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas b/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
index 5383235bd..59f33daeb 100644
--- a/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
+++ b/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
@@ -28,7 +28,7 @@ interface
 
 uses
   SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ComCtrls, EditBtn,
+  StdCtrls, ComCtrls, EditBtn, ExtCtrls,
 
   VpBaseDS, VpPrtFmtCBox;
 
@@ -48,6 +48,8 @@ type
     lblFormat: TLabel;
     edStartDate: TDateEdit;
     edEndDate: TDateEdit;
+    Panel1: TPanel;
+    ButtonPanel: TPanel;
     PrintFormatCombo: TVpPrintFormatComboBox;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -127,6 +129,8 @@ var
 begin
   AutoSize := false;
 
+  AlignOKCancel(btnOK, btnCancel, ButtonPanel);
+  (*
   btnOK.AutoSize := true;
   btnCancel.AutoSize := true;
   w := Max(btnOK.Width, btnCancel.Width);
@@ -155,6 +159,7 @@ begin
   btnCancel.TabOrder := PrintFormatCombo.TabOrder;
   btnOK.TabOrder := PrintFormatCombo.TabOrder + 1;
   {$ENDIF}
+  *)
 
   cnv := TControlCanvas.Create;
   try
diff --git a/components/tvplanit/source/vpabout.lfm b/components/tvplanit/source/vpabout.lfm
index e66b7ba8b..93a2202ce 100644
--- a/components/tvplanit/source/vpabout.lfm
+++ b/components/tvplanit/source/vpabout.lfm
@@ -1,47 +1,61 @@
 object frmAbout: TfrmAbout
-  Left = 282
-  Height = 313
-  Top = 205
-  Width = 582
+  Left = 368
+  Height = 339
+  Top = 312
+  Width = 634
   HorzScrollBar.Page = 470
   VertScrollBar.Page = 311
   AutoSize = True
   BorderStyle = bsDialog
   Caption = 'About Visual PlanIt'
-  ClientHeight = 313
-  ClientWidth = 582
+  ClientHeight = 339
+  ClientWidth = 634
   OnActivate = FormActivate
   Position = poScreenCenter
-  LCLVersion = '1.7'
+  LCLVersion = '1.6.4.0'
   object ButtonPanel: TPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Panel1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 50
-    Top = 265
-    Width = 582
-    Align = alTop
+    Height = 55
+    Top = 272
+    Width = 634
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
     BorderSpacing.Top = 8
     BevelOuter = bvNone
-    ClientHeight = 50
-    ClientWidth = 582
+    ClientHeight = 55
+    ClientWidth = 634
     TabOrder = 0
     object Bevel3: TBevel
       Left = 4
       Height = 8
       Top = 0
-      Width = 574
+      Width = 626
       Align = alTop
       BorderSpacing.Left = 4
       BorderSpacing.Right = 4
-      Shape = bsTopLine
+      BorderSpacing.Bottom = 7
+      Shape = bsBottomLine
     end
     object OKButton: TButton
-      AnchorSideTop.Control = ButtonPanel
+      AnchorSideTop.Control = CopyrightLabel
       AnchorSideTop.Side = asrCenter
-      Left = 496
-      Height = 25
-      Top = 13
-      Width = 75
+      AnchorSideRight.Control = ButtonPanel
+      AnchorSideRight.Side = asrBottom
+      Left = 576
+      Height = 33
+      Top = 14
+      Width = 50
       Anchors = [akTop, akRight]
+      AutoSize = True
+      BorderSpacing.Top = 8
+      BorderSpacing.Right = 8
+      BorderSpacing.Bottom = 8
+      BorderSpacing.InnerBorder = 4
       Cancel = True
       Caption = 'OK'
       Default = True
@@ -49,13 +63,17 @@ object frmAbout: TfrmAbout
       TabOrder = 0
     end
     object CopyrightLabel: TLabel
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideTop.Side = asrCenter
-      Left = 8
+      AnchorSideLeft.Control = ButtonPanel
+      AnchorSideTop.Control = Bevel3
+      AnchorSideTop.Side = asrBottom
+      Left = 4
       Height = 30
-      Top = 10
-      Width = 483
+      Top = 15
+      Width = 539
       Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 4
+      BorderSpacing.Top = 4
+      BorderSpacing.Bottom = 8
       Caption = '(C) Copyright 2001, TurboPower Software Company.'#13#10'All rights reserved.'
       ParentColor = False
       WordWrap = True
@@ -63,29 +81,30 @@ object frmAbout: TfrmAbout
   end
   object Panel1: TPanel
     Left = 0
-    Height = 257
+    Height = 264
     Top = 0
-    Width = 582
+    Width = 634
     Align = alTop
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 257
-    ClientWidth = 582
+    ClientHeight = 264
+    ClientWidth = 634
     TabOrder = 1
     object ImagePanel: TPanel
       Left = 4
-      Height = 249
-      Top = 4
+      Height = 252
+      Top = 8
       Width = 139
       Align = alLeft
+      BorderSpacing.Top = 4
       BorderSpacing.Around = 4
       BevelOuter = bvNone
-      ClientHeight = 249
+      ClientHeight = 252
       ClientWidth = 139
       TabOrder = 0
       object Image1: TImage
         Left = 0
-        Height = 249
+        Height = 252
         Top = 0
         Width = 139
         Align = alClient
@@ -1215,26 +1234,31 @@ object frmAbout: TfrmAbout
           E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117E117
           E117E117E117E117E117E1FF9139
         }
+        Proportional = True
+        Stretch = True
       end
     end
     object TextPanel: TPanel
       Left = 151
-      Height = 249
+      Height = 256
       Top = 8
-      Width = 431
+      Width = 483
       Align = alClient
+      AutoSize = True
       BorderSpacing.Left = 8
       BorderSpacing.Top = 8
       BevelOuter = bvNone
-      ClientHeight = 249
-      ClientWidth = 431
+      ClientHeight = 256
+      ClientWidth = 483
       TabOrder = 1
       object ProgramName: TLabel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = TextPanel
         Left = 0
         Height = 16
         Top = 0
-        Width = 431
-        Align = alTop
+        Width = 80
+        BorderSpacing.Right = 8
         Caption = 'Visual PlanIt'
         Font.Height = -13
         Font.Name = 'Default'
@@ -1243,23 +1267,32 @@ object frmAbout: TfrmAbout
         ParentFont = False
       end
       object Label1: TLabel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = ProgramName
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = lblLazPortLink
+        AnchorSideRight.Side = asrBottom
         Left = 0
         Height = 30
-        Top = 24
-        Width = 431
-        Align = alTop
-        BorderSpacing.Top = 8
+        Top = 28
+        Width = 410
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 12
         Caption = 'Visual PlanIt was released under the Mozilla 1.1 license in January, 2003. The project is hosted on SourceForge at'
         ParentColor = False
         WordWrap = True
       end
       object lblTurboLink: TLabel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = Label1
+        AnchorSideTop.Side = asrBottom
         Cursor = crHandPoint
-        Left = 0
+        Left = 12
         Height = 15
-        Top = 54
-        Width = 431
-        Align = alTop
+        Top = 58
+        Width = 222
+        BorderSpacing.Left = 12
+        BorderSpacing.Right = 8
         Caption = 'http://sourceforge.net/projects/tpvplanit/'
         Font.Color = clBlue
         ParentColor = False
@@ -1269,24 +1302,30 @@ object frmAbout: TfrmAbout
         OnMouseLeave = lblLinkMouseLeave
       end
       object Label4: TLabel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = lblTurboLink
+        AnchorSideTop.Side = asrBottom
         Left = 0
         Height = 15
-        Top = 77
-        Width = 431
-        Align = alTop
-        BorderSpacing.Top = 8
+        Top = 85
+        Width = 150
+        BorderSpacing.Top = 12
+        BorderSpacing.Right = 8
         Caption = 'The Lazarus port is hosted at'
         ParentColor = False
         WordWrap = True
       end
       object lblLazPortLink: TLabel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = Label4
+        AnchorSideTop.Side = asrBottom
         Cursor = crHandPoint
-        Left = 0
+        Left = 12
         Height = 15
-        Top = 92
-        Width = 414
-        Align = alTop
-        BorderSpacing.Right = 17
+        Top = 100
+        Width = 398
+        BorderSpacing.Left = 12
+        BorderSpacing.Right = 8
         Caption = 'http://sourceforge.net/p/lazarus-ccr/svn/HEAD/tree/components/tvplanit/'
         Font.Color = clBlue
         ParentColor = False
@@ -1296,24 +1335,28 @@ object frmAbout: TfrmAbout
         OnMouseLeave = lblLinkMouseLeave
       end
       object SupportPanel: TPanel
+        AnchorSideLeft.Control = TextPanel
+        AnchorSideTop.Control = lblLazPortLink
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = lblLazPortLink
+        AnchorSideRight.Side = asrBottom
         Left = 0
         Height = 133
-        Top = 115
-        Width = 421
-        Align = alTop
+        Top = 123
+        Width = 410
+        Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Top = 8
-        BorderSpacing.Right = 10
         BevelInner = bvRaised
         BevelOuter = bvLowered
         ClientHeight = 133
-        ClientWidth = 421
+        ClientWidth = 410
         TabOrder = 0
         object GeneralNewsgroupsLabel: TLabel
           Left = 6
           Height = 15
           Top = 6
-          Width = 409
+          Width = 398
           Align = alTop
           BorderSpacing.Left = 4
           BorderSpacing.Top = 4
@@ -1326,7 +1369,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 25
-          Width = 397
+          Width = 386
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Top = 4
@@ -1339,7 +1382,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 40
-          Width = 397
+          Width = 386
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Right = 4
@@ -1355,7 +1398,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 59
-          Width = 397
+          Width = 386
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Top = 4
@@ -1368,7 +1411,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 74
-          Width = 397
+          Width = 386
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Right = 4
@@ -1384,7 +1427,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 93
-          Width = 397
+          Width = 386
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Top = 4
@@ -1397,7 +1440,7 @@ object frmAbout: TfrmAbout
           Left = 18
           Height = 15
           Top = 108
-          Width = 401
+          Width = 390
           Align = alTop
           BorderSpacing.Left = 16
           BorderSpacing.Bottom = 8
diff --git a/components/tvplanit/source/vpcontacteditdlg.lfm b/components/tvplanit/source/vpcontacteditdlg.lfm
index 87f0ab70f..0587b46bd 100644
--- a/components/tvplanit/source/vpcontacteditdlg.lfm
+++ b/components/tvplanit/source/vpcontacteditdlg.lfm
@@ -1392,15 +1392,11 @@ object ContactEditForm: TContactEditForm
     ClientWidth = 506
     TabOrder = 1
     object OKBtn: TButton
-      AnchorSideTop.Control = pnlBottom
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = CancelBtn
-      AnchorSideBottom.Side = asrBottom
       Left = 354
       Height = 25
       Top = 4
       Width = 74
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Top = 4
       BorderSpacing.Right = 8
       BorderSpacing.Bottom = 4
@@ -1410,15 +1406,11 @@ object ContactEditForm: TContactEditForm
       TabOrder = 0
     end
     object CancelBtn: TButton
-      AnchorSideTop.Control = pnlBottom
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = pnlBottom
-      AnchorSideRight.Side = asrBottom
       Left = 436
       Height = 25
       Top = 4
       Width = 62
-      Anchors = [akTop, akRight]
+      Align = alRight
       AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 8
diff --git a/components/tvplanit/source/vpcontacteditdlg.pas b/components/tvplanit/source/vpcontacteditdlg.pas
index 31df9adc4..41ca6cb8d 100644
--- a/components/tvplanit/source/vpcontacteditdlg.pas
+++ b/components/tvplanit/source/vpcontacteditdlg.pas
@@ -147,8 +147,6 @@ type
     procedure OKBtnClick(Sender: TObject);
     procedure PageControlChange(Sender: TObject);
   private
-    FBtnHeight: Integer;
-    FEditHeight: Integer;
     procedure DisplayCurrentCountry(AddressType: TVpAddressType);
     procedure PositionControls;
     procedure SetCaptions;
@@ -206,8 +204,6 @@ procedure TContactEditForm.FormCreate(Sender: TObject);
 begin
   ReturnCode := rtAbandon;
   SetCaptions;
-  FBtnHeight := ScaleY(OKBtn.Height, DesignTimeDPI);
-  FEditHeight := ScaleY(edCompany.Height, DesigntimeDPI);
 end;
 
 procedure TContactEditForm.SetCaptions;
@@ -524,7 +520,7 @@ begin
   vdist := ScaleY(vdist, DesignTimeDPI);
   hBorder := ScaleX(hBorder, DesignTimeDPI);
   vBorder := ScaleY(vBorder, DesignTimeDPI);
-  edBirthdate.ButtonWidth := FEditHeight;
+  edBirthdate.ButtonWidth := edBirthdate.Height;
   comboArrowWidth := GetSystemMetrics(SM_CXVSCROLL);
 
   for i := 0 to ComponentCount-1 do
diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm
index 408c92eb1..0c7827feb 100644
--- a/components/tvplanit/source/vpedelem.lfm
+++ b/components/tvplanit/source/vpedelem.lfm
@@ -1,15 +1,15 @@
 object frmEditElement: TfrmEditElement
   Left = 288
-  Height = 516
+  Height = 465
   Top = 321
-  Width = 661
+  Width = 608
   HorzScrollBar.Page = 378
   VertScrollBar.Page = 444
   AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Edit Element'
-  ClientHeight = 516
-  ClientWidth = 661
+  ClientHeight = 465
+  ClientWidth = 608
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
@@ -18,7 +18,7 @@ object frmEditElement: TfrmEditElement
     Left = 12
     Height = 144
     Top = 196
-    Width = 637
+    Width = 584
     Align = alTop
     AutoSize = True
     BorderSpacing.Left = 12
@@ -26,7 +26,7 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Right = 12
     Caption = ' Visual '
     ClientHeight = 124
-    ClientWidth = 633
+    ClientWidth = 580
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 3
@@ -361,7 +361,7 @@ object frmEditElement: TfrmEditElement
     Left = 12
     Height = 54
     Top = 352
-    Width = 637
+    Width = 584
     Align = alTop
     AutoSize = True
     BorderSpacing.Left = 12
@@ -370,7 +370,7 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Bottom = 6
     Caption = ' Caption '
     ClientHeight = 34
-    ClientWidth = 633
+    ClientWidth = 580
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 4
@@ -393,7 +393,7 @@ object frmEditElement: TfrmEditElement
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = gbCaption
       AnchorSideRight.Side = asrBottom
-      Left = 566
+      Left = 513
       Height = 25
       Top = 1
       Width = 59
@@ -413,7 +413,7 @@ object frmEditElement: TfrmEditElement
       Left = 43
       Height = 23
       Top = 2
-      Width = 519
+      Width = 466
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Top = 2
@@ -428,7 +428,7 @@ object frmEditElement: TfrmEditElement
     Left = 12
     Height = 23
     Top = 8
-    Width = 637
+    Width = 584
     Align = alTop
     AutoSize = True
     BorderSpacing.Left = 12
@@ -437,7 +437,7 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Bottom = 8
     BevelOuter = bvNone
     ClientHeight = 23
-    ClientWidth = 637
+    ClientWidth = 584
     TabOrder = 0
     object lblName: TLabel
       AnchorSideTop.Control = edName
@@ -455,7 +455,7 @@ object frmEditElement: TfrmEditElement
       Left = 42
       Height = 23
       Top = 0
-      Width = 595
+      Width = 542
       Align = alRight
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Left = 4
@@ -466,7 +466,7 @@ object frmEditElement: TfrmEditElement
     Left = 12
     Height = 51
     Top = 133
-    Width = 639
+    Width = 586
     Align = alTop
     AutoSize = True
     BorderSpacing.Left = 12
@@ -474,7 +474,7 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Right = 10
     BevelOuter = bvNone
     ClientHeight = 51
-    ClientWidth = 639
+    ClientWidth = 586
     TabOrder = 2
     object gbDayOffset: TGroupBox
       AnchorSideTop.Control = Panel2
@@ -533,7 +533,7 @@ object frmEditElement: TfrmEditElement
       Left = 108
       Height = 51
       Top = 0
-      Width = 531
+      Width = 478
       Anchors = [akTop, akLeft, akRight]
       AutoFill = True
       AutoSize = True
@@ -548,7 +548,7 @@ object frmEditElement: TfrmEditElement
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 4
       ClientHeight = 31
-      ClientWidth = 527
+      ClientWidth = 474
       Columns = 4
       ItemIndex = 0
       Items.Strings = (
@@ -565,7 +565,7 @@ object frmEditElement: TfrmEditElement
     Left = 0
     Height = 25
     Top = 414
-    Width = 649
+    Width = 596
     Align = alTop
     AutoSize = True
     BorderSpacing.Top = 8
@@ -573,7 +573,7 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Bottom = 8
     BevelOuter = bvNone
     ClientHeight = 25
-    ClientWidth = 649
+    ClientWidth = 596
     TabOrder = 5
     object btnShape: TButton
       AnchorSideLeft.Control = ButtonPanel
@@ -589,12 +589,11 @@ object frmEditElement: TfrmEditElement
       TabOrder = 0
     end
     object btnOk: TButton
-      AnchorSideRight.Control = btnCancel
-      Left = 512
+      Left = 459
       Height = 25
       Top = 0
       Width = 71
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Right = 4
       Caption = 'OK'
       Default = True
@@ -602,13 +601,11 @@ object frmEditElement: TfrmEditElement
       TabOrder = 1
     end
     object btnCancel: TButton
-      AnchorSideRight.Control = ButtonPanel
-      AnchorSideRight.Side = asrBottom
-      Left = 587
+      Left = 534
       Height = 25
       Top = 0
       Width = 62
-      Anchors = [akTop, akRight]
+      Align = alRight
       AutoSize = True
       Cancel = True
       Caption = 'Cancel'
@@ -620,7 +617,7 @@ object frmEditElement: TfrmEditElement
     Left = 12
     Height = 78
     Top = 43
-    Width = 639
+    Width = 586
     Align = alTop
     AutoSize = True
     BorderSpacing.Left = 12
@@ -628,13 +625,13 @@ object frmEditElement: TfrmEditElement
     BorderSpacing.Right = 10
     BevelOuter = bvNone
     ClientHeight = 78
-    ClientWidth = 639
+    ClientWidth = 586
     TabOrder = 1
     object rgItemType: TRadioGroup
       Left = 0
       Height = 78
       Top = 0
-      Width = 639
+      Width = 586
       Align = alClient
       AutoFill = True
       BorderSpacing.InnerBorder = 4
@@ -648,7 +645,7 @@ object frmEditElement: TfrmEditElement
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 4
       ClientHeight = 58
-      ClientWidth = 635
+      ClientWidth = 582
       Columns = 4
       ItemIndex = 0
       Items.Strings = (
@@ -671,7 +668,7 @@ object frmEditElement: TfrmEditElement
     Font.Name = 'MS Sans Serif'
     MinFontSize = 0
     MaxFontSize = 0
-    left = 272
-    top = 424
+    left = 536
+    top = 304
   end
 end
diff --git a/components/tvplanit/source/vpedfmt.lfm b/components/tvplanit/source/vpedfmt.lfm
index 668b85baa..8077cc9e9 100644
--- a/components/tvplanit/source/vpedfmt.lfm
+++ b/components/tvplanit/source/vpedfmt.lfm
@@ -16,7 +16,7 @@ object frmEditFormat: TfrmEditFormat
   LCLVersion = '1.6.4.0'
   object Panel1: TPanel
     Left = 8
-    Height = 157
+    Height = 158
     Top = 8
     Width = 331
     Align = alClient
@@ -25,7 +25,7 @@ object frmEditFormat: TfrmEditFormat
     BorderSpacing.Top = 8
     BorderSpacing.Right = 8
     BevelOuter = bvNone
-    ClientHeight = 157
+    ClientHeight = 158
     ClientWidth = 331
     TabOrder = 0
     object LblName: TLabel
@@ -167,24 +167,21 @@ object frmEditFormat: TfrmEditFormat
   end
   object ButtonPanel: TPanel
     Left = 0
-    Height = 34
-    Top = 165
+    Height = 33
+    Top = 166
     Width = 347
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 34
+    ClientHeight = 33
     ClientWidth = 347
     TabOrder = 1
     object btnOk: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = btnCancel
       Left = 231
       Height = 25
-      Top = 5
+      Top = 4
       Width = 42
-      Anchors = [akTop, akRight]
+      Align = alRight
       AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
@@ -195,15 +192,11 @@ object frmEditFormat: TfrmEditFormat
       TabOrder = 0
     end
     object btnCancel: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = ButtonPanel
-      AnchorSideRight.Side = asrBottom
       Left = 277
       Height = 25
-      Top = 5
+      Top = 4
       Width = 62
-      Anchors = [akTop, akRight]
+      Align = alRight
       AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 8
diff --git a/components/tvplanit/source/vpedshape.lfm b/components/tvplanit/source/vpedshape.lfm
index aa170a1b0..8eb6cf43f 100644
--- a/components/tvplanit/source/vpedshape.lfm
+++ b/components/tvplanit/source/vpedshape.lfm
@@ -1,69 +1,36 @@
 object frmEditShape: TfrmEditShape
   Left = 663
-  Height = 270
+  Height = 267
   Top = 242
-  Width = 444
+  Width = 446
   HorzScrollBar.Page = 362
   VertScrollBar.Page = 313
   AutoSize = True
   BorderStyle = bsDialog
   Caption = 'Edit Shape'
-  ClientHeight = 270
-  ClientWidth = 444
+  ClientHeight = 267
+  ClientWidth = 446
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poScreenCenter
   ShowHint = True
-  LCLVersion = '1.6.0.4'
-  object btnOk: TButton
-    AnchorSideRight.Control = btnCancel
-    AnchorSideBottom.Control = gbPen
-    AnchorSideBottom.Side = asrBottom
-    Left = 301
-    Height = 35
-    Top = 222
-    Width = 50
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Left = 8
-    Caption = 'OK'
-    Default = True
-    OnClick = btnOkClick
-    TabOrder = 3
-  end
-  object btnCancel: TButton
-    AnchorSideRight.Control = gbBrush
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = gbPen
-    AnchorSideBottom.Side = asrBottom
-    Left = 359
-    Height = 35
-    Top = 222
-    Width = 77
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Left = 8
-    Cancel = True
-    Caption = 'Cancel'
-    OnClick = btnCancelClick
-    TabOrder = 4
-  end
+  LCLVersion = '1.6.4.0'
   object gbBrush: TGroupBox
     AnchorSideLeft.Control = gbPen
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = gbPen
     AnchorSideRight.Side = asrBottom
-    Left = 233
-    Height = 97
+    Left = 216
+    Height = 82
     Top = 80
-    Width = 203
+    Width = 188
     AutoSize = True
     BorderSpacing.Left = 12
     BorderSpacing.Right = 12
     Caption = ' Brush '
-    ClientHeight = 67
-    ClientWidth = 199
+    ClientHeight = 62
+    ClientWidth = 184
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 2
@@ -71,10 +38,10 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Control = cbBrushStyle
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = cbBrushStyle
-      Left = 13
-      Height = 25
+      Left = 12
+      Height = 15
       Top = 32
-      Width = 42
+      Width = 28
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -89,9 +56,9 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = cbBrushColor
       AnchorSideRight.Side = asrBottom
-      Left = 63
+      Left = 48
       Height = 21
-      Top = 34
+      Top = 29
       Width = 128
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 8
@@ -108,9 +75,9 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = cbBrushColor
       Left = 8
-      Height = 25
-      Top = 1
-      Width = 47
+      Height = 15
+      Top = 6
+      Width = 32
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -123,7 +90,7 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Control = gbBrush
       AnchorSideRight.Control = gbBrush
       AnchorSideRight.Side = asrBottom
-      Left = 63
+      Left = 48
       Height = 22
       Top = 2
       Width = 128
@@ -142,16 +109,16 @@ object frmEditShape: TfrmEditShape
     AnchorSideTop.Control = gbShapes
     AnchorSideTop.Side = asrBottom
     Left = 12
-    Height = 177
+    Height = 147
     Top = 80
-    Width = 209
+    Width = 192
     AutoSize = True
     BorderSpacing.Left = 12
     BorderSpacing.Top = 8
     BorderSpacing.Bottom = 12
     Caption = ' Pen '
-    ClientHeight = 147
-    ClientWidth = 205
+    ClientHeight = 127
+    ClientWidth = 188
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 1
@@ -159,10 +126,10 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Control = cbPenStyle
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = cbPenStyle
-      Left = 18
-      Height = 25
-      Top = 30
-      Width = 42
+      Left = 15
+      Height = 15
+      Top = 35
+      Width = 28
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -177,9 +144,9 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = edPenWidth
       Left = 8
-      Height = 25
+      Height = 15
       Top = 65
-      Width = 52
+      Width = 35
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -193,9 +160,9 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = cbPenMode
       Left = 9
-      Height = 25
-      Top = 106
-      Width = 51
+      Height = 15
+      Top = 96
+      Width = 34
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -210,7 +177,7 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = cbPenColor
       AnchorSideRight.Side = asrBottom
-      Left = 68
+      Left = 51
       Height = 21
       Top = 32
       Width = 129
@@ -230,14 +197,14 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = cbPenColor
       AnchorSideRight.Side = asrBottom
-      Left = 68
-      Height = 33
-      Top = 102
+      Left = 51
+      Height = 23
+      Top = 92
       Width = 129
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 8
       BorderSpacing.Bottom = 12
-      ItemHeight = 25
+      ItemHeight = 15
       ParentFont = False
       TabOrder = 4
     end
@@ -246,8 +213,8 @@ object frmEditShape: TfrmEditShape
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = edPenWidth
       AnchorSideTop.Side = asrCenter
-      Left = 121
-      Height = 33
+      Left = 104
+      Height = 23
       Top = 61
       Width = 12
       Associate = edPenWidth
@@ -260,8 +227,8 @@ object frmEditShape: TfrmEditShape
       AnchorSideLeft.Control = cbPenStyle
       AnchorSideTop.Control = cbPenStyle
       AnchorSideTop.Side = asrBottom
-      Left = 68
-      Height = 33
+      Left = 51
+      Height = 23
       Top = 61
       Width = 53
       Alignment = taRightJustify
@@ -275,7 +242,7 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Control = gbPen
       AnchorSideRight.Control = gbPen
       AnchorSideRight.Side = asrBottom
-      Left = 68
+      Left = 51
       Height = 22
       Top = 2
       Width = 129
@@ -292,10 +259,10 @@ object frmEditShape: TfrmEditShape
       AnchorSideTop.Control = cbPenColor
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = cbPenColor
-      Left = 17
-      Height = 25
-      Top = 1
-      Width = 43
+      Left = 14
+      Height = 15
+      Top = 6
+      Width = 29
       Anchors = [akTop, akRight]
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
@@ -313,7 +280,7 @@ object frmEditShape: TfrmEditShape
     Left = 12
     Height = 64
     Top = 8
-    Width = 424
+    Width = 392
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 12
     BorderSpacing.Top = 8
@@ -324,71 +291,113 @@ object frmEditShape: TfrmEditShape
     ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 8
-    ClientHeight = 34
-    ClientWidth = 420
+    ClientHeight = 44
+    ClientWidth = 388
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 0
     object SpeedButton1: TSpeedButton
       Left = 8
-      Height = 26
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       BorderSpacing.Left = 8
       BorderSpacing.Bottom = 8
       Down = True
       GroupIndex = 1
     end
     object SpeedButton2: TSpeedButton
-      Left = 60
-      Height = 26
+      Left = 56
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton3: TSpeedButton
-      Left = 112
-      Height = 26
+      Left = 104
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton4: TSpeedButton
-      Left = 164
-      Height = 26
+      Left = 152
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton5: TSpeedButton
-      Left = 216
-      Height = 26
+      Left = 200
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton6: TSpeedButton
-      Left = 268
-      Height = 26
+      Left = 248
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton7: TSpeedButton
-      Left = 320
-      Height = 26
+      Left = 296
+      Height = 36
       Top = 0
-      Width = 44
+      Width = 40
       GroupIndex = 1
     end
     object SpeedButton8: TSpeedButton
-      Left = 372
-      Height = 26
+      Left = 344
+      Height = 36
       Top = 0
-      Width = 40
+      Width = 36
       BorderSpacing.Right = 8
       BorderSpacing.Bottom = 8
       GroupIndex = 1
     end
   end
+  object ButtonPanel: TPanel
+    AnchorSideRight.Control = gbBrush
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = gbPen
+    AnchorSideBottom.Side = asrBottom
+    Left = 232
+    Height = 25
+    Top = 202
+    Width = 172
+    Anchors = [akLeft, akRight, akBottom]
+    AutoSize = True
+    BevelOuter = bvNone
+    ClientHeight = 25
+    ClientWidth = 172
+    TabOrder = 3
+    object btnOk: TButton
+      Left = 60
+      Height = 25
+      Top = 0
+      Width = 42
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Left = 8
+      Caption = 'OK'
+      Default = True
+      OnClick = btnOkClick
+      TabOrder = 0
+    end
+    object btnCancel: TButton
+      Left = 110
+      Height = 25
+      Top = 0
+      Width = 62
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Left = 8
+      Cancel = True
+      Caption = 'Cancel'
+      OnClick = btnCancelClick
+      TabOrder = 1
+    end
+  end
 end
diff --git a/components/tvplanit/source/vpedshape.pas b/components/tvplanit/source/vpedshape.pas
index e4791e4a8..1a4e2a6b8 100644
--- a/components/tvplanit/source/vpedshape.pas
+++ b/components/tvplanit/source/vpedshape.pas
@@ -63,6 +63,7 @@ type
     lblPenColor: TLabel;
     lblPenWidth: TLabel;
     lblPenMode: TLabel;
+    ButtonPanel: TPanel;
     SpeedButton1: TSpeedButton;
     SpeedButton2: TSpeedButton;
     SpeedButton3: TSpeedButton;
@@ -404,6 +405,10 @@ begin
 
   udPenWidth.Width := udPenWidth.Height div 2 + 1;
 
+  // Autosize OK and Cancel buttons and put them in the right order
+  AlignOKCancel(btnOK, btnCancel, ButtonPanel);
+  (*
+
   // Autosize OK and Cancel buttons and put them in the right order
   btnOK.AutoSize := true;
   btnCancel.AutoSize := true;
@@ -429,12 +434,12 @@ begin
   {$ELSE}              // button order: Cancel - OK
   btnOK.AnchorSideRight.Control := gbBrush;
   btnOK.Anchors := [akTop, akRight];
-  btnCancel.AnchorSideRight.Control := OKbtn;
+  btnCancel.AnchorSideRight.Control := btnOK;
   btnCancel.Anchors := [akBottom, akRight];
   btnCancel.TabOrder := cbBrushStyle.TabOrder + 1;
   btnOK.TabOrder := btnOK.TabOrder + 1;
   wbtn := btnCancel.Width + btnOK.Width + btnOK.BorderSpacing.Left;
-  {$ENDIF}
+  {$ENDIF}     *)
 
   // A workaround for the combobox height issue at higher dpi values:
   // Create a combobox at runtime, it has the correct height, and apply its
@@ -472,6 +477,7 @@ begin
     CbBrushStyle.Width := w;
     gbPen.AutoSize := true;
     gbBrush.AutoSize := true;
+    wbtn := btnOK.Width + btnCancel.Width + btnOK.BorderSpacing.Left;;
     if gbBrush.Width < wbtn then begin
       gbBrush.AutoSize := false;
       gbBrush.Width := wbtn;
diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 917347856..511cb1e91 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -40,13 +40,11 @@ object DlgEventEdit: TDlgEventEdit
       ParentFont = False
     end
     object OKBtn: TButton
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = CancelBtn
-      Left = 571
+      Left = 577
       Height = 25
       Top = 6
       Width = 66
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
       BorderSpacing.Bottom = 6
@@ -56,15 +54,13 @@ object DlgEventEdit: TDlgEventEdit
       TabOrder = 0
     end
     object CancelBtn: TButton
-      AnchorSideRight.Control = ButtonPanel
-      AnchorSideRight.Side = asrBottom
-      Left = 643
+      Left = 649
       Height = 25
       Top = 6
       Width = 71
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Top = 6
-      BorderSpacing.Right = 12
+      BorderSpacing.Right = 6
       BorderSpacing.Bottom = 6
       Cancel = True
       Caption = '&Cancel'
diff --git a/components/tvplanit/source/vpflxdsed1.lfm b/components/tvplanit/source/vpflxdsed1.lfm
index 10eb830a8..5aa0306c7 100644
--- a/components/tvplanit/source/vpflxdsed1.lfm
+++ b/components/tvplanit/source/vpflxdsed1.lfm
@@ -24,13 +24,12 @@ object frmFieldMapper: TfrmFieldMapper
     ClientWidth = 655
     TabOrder = 1
     object BtnOK: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideRight.Control = BtnCancel
-      Left = 384
+      Left = 542
       Height = 25
       Top = 5
-      Width = 115
-      Anchors = [akTop]
+      Width = 42
+      Align = alRight
+      AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
       BorderSpacing.Bottom = 4
@@ -39,14 +38,11 @@ object frmFieldMapper: TfrmFieldMapper
       TabOrder = 0
     end
     object BtnCancel: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideRight.Control = ButtonPanel
-      AnchorSideRight.Side = asrBottom
-      Left = 580
+      Left = 588
       Height = 25
       Top = 5
       Width = 62
-      Anchors = [akTop]
+      Align = alRight
       AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
diff --git a/components/tvplanit/source/vpmisc.pas b/components/tvplanit/source/vpmisc.pas
index 7dcc0fcf4..b534de31f 100644
--- a/components/tvplanit/source/vpmisc.pas
+++ b/components/tvplanit/source/vpmisc.pas
@@ -436,6 +436,8 @@ procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
 var
   w, h: Integer;
 begin
+  APanel.AutoSize := true;
+
   OKButton.AutoSize := true;
   CancelButton.AutoSize := true;
   w := Max(OKButton.Width, CancelButton.Width);
@@ -444,23 +446,33 @@ begin
   OKButton.AutoSize := false;
   OKButton.Width := w;
   OKButton.Height := h;
+  OKButton.Align := alRight;
 
   CancelButton.AutoSize := false;
   CancelButton.Width := w;
   CancelButton.Height := h;
+  CancelButton.Align := alRight;
 
   {$IFDEF MSWINDOWS}   // button order: OK - Cancel
+  CancelButton.Left := APanel.Width;
+  OKButton.Left := 0;
+{
   CancelButton.AnchorSideRight.Control := APanel;
   CancelButton.Anchors := [akTop, akRight];
   OKButton.AnchorSideRight.Control := CancelButton;
   OKButton.Anchors := [akTop, akRight];
+  }
   OKButton.TabOrder := 0;
   CancelButton.TabOrder := 1;
   {$ELSE}              // button order: Cancel - OK
+  OKButton.Left := APanel.Width;
+  CancelButton.Left := 0;
+{
   OKButton.AnchorSideRight.Control := APanel;
   OKButton.Anchors := [akTop, akRight];
   CancelButton.AnchorSideRight.Control := OKButton;
   CancelButton.Anchors := [akTop, akRight];
+  }
   CancelButton.TabOrder := 0;
   OKButton.TabOrder := 1;
   {$ENDIF}
diff --git a/components/tvplanit/source/vpreseditdlg.lfm b/components/tvplanit/source/vpreseditdlg.lfm
index 1ef45982c..af7e95575 100644
--- a/components/tvplanit/source/vpreseditdlg.lfm
+++ b/components/tvplanit/source/vpreseditdlg.lfm
@@ -25,14 +25,11 @@ object ResEditForm: TResEditForm
     ClientWidth = 466
     TabOrder = 1
     object OKBtn: TButton
-      AnchorSideTop.Control = pnlBottom
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = CancelBtn
       Left = 313
       Height = 25
       Top = 4
       Width = 66
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
       BorderSpacing.Bottom = 4
@@ -43,15 +40,11 @@ object ResEditForm: TResEditForm
       TabStop = False
     end
     object CancelBtn: TButton
-      AnchorSideTop.Control = pnlBottom
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = pnlBottom
-      AnchorSideRight.Side = asrBottom
       Left = 383
       Height = 25
       Top = 4
       Width = 75
-      Anchors = [akTop, akRight]
+      Align = alRight
       BorderSpacing.Top = 4
       BorderSpacing.Right = 8
       BorderSpacing.Bottom = 4
diff --git a/components/tvplanit/source/vpselresdlg.lfm b/components/tvplanit/source/vpselresdlg.lfm
index a99d46f56..3caa6bf88 100644
--- a/components/tvplanit/source/vpselresdlg.lfm
+++ b/components/tvplanit/source/vpselresdlg.lfm
@@ -9,7 +9,7 @@ object frmSelectResource: TfrmSelectResource
   ClientHeight = 162
   ClientWidth = 274
   Position = poDesktopCenter
-  LCLVersion = '1.7'
+  LCLVersion = '1.6.4.0'
   object Bevel1: TBevel
     Left = 8
     Height = 105
@@ -26,7 +26,7 @@ object frmSelectResource: TfrmSelectResource
   end
   object VpResourceCombo1: TVpResourceCombo
     Left = 16
-    Height = 21
+    Height = 23
     Top = 40
     Width = 232
     Style = csDropDownList
@@ -70,7 +70,7 @@ object frmSelectResource: TfrmSelectResource
     TabOrder = 2
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.03'
+    Version = 'v1.05'
     Options = []
     Placement.Position = mpCenter
     Placement.Top = 10
diff --git a/components/tvplanit/source/vptaskeditdlg.lfm b/components/tvplanit/source/vptaskeditdlg.lfm
index 8546995b6..7f14008de 100644
--- a/components/tvplanit/source/vptaskeditdlg.lfm
+++ b/components/tvplanit/source/vptaskeditdlg.lfm
@@ -40,14 +40,12 @@ object TaskEditForm: TTaskEditForm
       ParentFont = False
     end
     object OKBtn: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideBottom.Side = asrBottom
-      Left = 376
+      Left = 435
       Height = 25
       Top = 4
-      Width = 86
-      Anchors = [akTop, akRight]
+      Width = 42
+      Align = alRight
+      AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
       BorderSpacing.Bottom = 4
@@ -57,14 +55,11 @@ object TaskEditForm: TTaskEditForm
       TabOrder = 0
     end
     object CancelBtn: TButton
-      AnchorSideTop.Control = ButtonPanel
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Side = asrBottom
-      Left = 479
+      Left = 481
       Height = 25
       Top = 4
       Width = 62
-      Anchors = [akTop, akRight]
+      Align = alRight
       AutoSize = True
       BorderSpacing.Top = 4
       BorderSpacing.Right = 4
diff --git a/components/tvplanit/source/vpwavdlg.lfm b/components/tvplanit/source/vpwavdlg.lfm
index 058cdb3fe..af92486a8 100644
--- a/components/tvplanit/source/vpwavdlg.lfm
+++ b/components/tvplanit/source/vpwavdlg.lfm
@@ -79,6 +79,8 @@ object FrmSoundDialog: TFrmSoundDialog
             Height = 25
             Top = 4
             Width = 29
+            BorderSpacing.Top = 4
+            BorderSpacing.Bottom = 4
             Glyph.Data = {
               DE010000424DDE01000000000000760000002800000024000000120000000100
               0400000000006801000000000000000000001000000010000000000000000000
@@ -101,14 +103,11 @@ object FrmSoundDialog: TFrmSoundDialog
             OnClick = PlayButtonClick
           end
           object OkBtn: TButton
-            AnchorSideTop.Control = ButtonPanel
-            AnchorSideTop.Side = asrCenter
-            AnchorSideRight.Control = CancelBtn
             Left = 361
             Height = 25
             Top = 4
             Width = 75
-            Anchors = [akTop, akRight]
+            Align = alRight
             BorderSpacing.Left = 4
             BorderSpacing.Top = 4
             BorderSpacing.Bottom = 4
@@ -119,14 +118,11 @@ object FrmSoundDialog: TFrmSoundDialog
             TabOrder = 0
           end
           object CancelBtn: TButton
-            AnchorSideTop.Control = ButtonPanel
-            AnchorSideRight.Control = ButtonPanel
-            AnchorSideRight.Side = asrBottom
             Left = 440
             Height = 25
             Top = 4
             Width = 75
-            Anchors = [akTop, akRight]
+            Align = alRight
             BorderSpacing.Left = 4
             BorderSpacing.Top = 4
             BorderSpacing.Bottom = 4