Index: AAPClient/UI/InfoLogScherm.dfm
===================================================================
diff -u -r95 -r101
--- AAPClient/UI/InfoLogScherm.dfm	(.../InfoLogScherm.dfm)	(revision 95)
+++ AAPClient/UI/InfoLogScherm.dfm	(.../InfoLogScherm.dfm)	(revision 101)
@@ -41,7 +41,7 @@
     AutoSize = False
     Caption = 'Afgescand:'
   end
-  object sgToeleveringData: TStringGrid [9]
+  object sgToeleveringData: TStringGrid [6]
     Left = 8
     Top = 58
     Width = 186
@@ -59,48 +59,51 @@
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSelect]
     ParentFont = False
     ScrollBars = ssNone
-    TabOrder = 3
+    TabOrder = 0
   end
-  object btnEerst: TButton [10]
+  object btnEerst: TButton [7]
     Left = 199
     Top = 58
     Width = 25
     Height = 25
     ImageIndex = 2
     Images = ImagesScherm.ilAlgemeen16
-    TabOrder = 4
+    TabOrder = 1
     OnClick = btnEerstClick
   end
-  object btnVorige: TButton [11]
+  object btnVorige: TButton [8]
     Left = 199
     Top = 89
     Width = 25
     Height = 25
     ImageIndex = 1
     Images = ImagesScherm.ilAlgemeen16
-    TabOrder = 5
+    TabOrder = 2
     OnClick = btnVorigeClick
   end
-  object btnVolgende: TButton [12]
+  object btnVolgende: TButton [9]
     Left = 199
     Top = 120
     Width = 25
     Height = 25
     ImageIndex = 0
     Images = ImagesScherm.ilAlgemeen16
-    TabOrder = 6
+    TabOrder = 3
     OnClick = btnVolgendeClick
   end
-  object btnLaatst: TButton [13]
+  object btnLaatst: TButton [10]
     Left = 199
     Top = 151
     Width = 25
     Height = 25
     ImageIndex = 3
     Images = ImagesScherm.ilAlgemeen16
-    TabOrder = 7
+    TabOrder = 4
     OnClick = btnLaatstClick
   end
+  inherited pnlDrieKnoppen: TPanel
+    TabOrder = 5
+  end
   inherited alAlgemeen: TActionList
     inherited actVolgende: TAction
       OnExecute = actVolgendeExecute
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r73 -r101
--- AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 73)
+++ AAPClient/UI/LoginScherm.pas	(.../LoginScherm.pas)	(revision 101)
@@ -5,7 +5,7 @@
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList,
-  Vcl.StdCtrls, Images, Vcl.ImgList;
+  Vcl.StdCtrls, Images, Vcl.ImgList, Vcl.ExtCtrls;
 
 type
   TfmLoginScherm = class(TfmDrieKnoppenScherm)
Index: AAPClient/UI/LoginScherm.dfm
===================================================================
diff -u -r95 -r101
--- AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 95)
+++ AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 101)
@@ -23,17 +23,7 @@
     Height = 19
     Caption = 'Initalen:'
   end
-  inherited btnLinksOnder: TButton
-    Action = nil
-    ImageIndex = 1
-    ModalResult = 3
-    TabOrder = 2
-    OnClick = actAfsluitenExecute
-  end
-  inherited btnCentraalOnder: TButton
-    TabOrder = 3
-  end
-  object edtPincode: TEdit [6]
+  object edtPincode: TEdit [4]
     Left = 103
     Top = 123
     Width = 121
@@ -43,7 +33,7 @@
     Text = '0030'
     OnKeyUp = edtPincodeKeyUp
   end
-  object edtInitialen: TEdit [7]
+  object edtInitialen: TEdit [5]
     Left = 103
     Top = 90
     Width = 121
@@ -53,9 +43,8 @@
     Text = 'NBO'
     OnKeyUp = edtInitialenKeyUp
   end
-  inherited btnRechtsOnder: TButton
-    Default = True
-    TabOrder = 4
+  inherited pnlDrieKnoppen: TPanel
+    TabOrder = 2
   end
   inherited alKnoppenOnder: TActionList
     inherited actLinksOnder: TAction
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r95 -r101
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 95)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 101)
@@ -6,7 +6,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList,
   Vcl.StdCtrls, Vcl.Grids, DnaCodeService, Data.DB, Datasnap.DBClient, Images,
-  Vcl.DBGrids, UiContext;
+  Vcl.DBGrids, UiContext, Vcl.ExtCtrls;
 
 type
   TfmInfoLogScherm = class(TfmDrieKnoppenScherm)