Index: AAPClient/ProScanMain.dfm
===================================================================
diff -u -r240 -r241
--- AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 240)
+++ AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 241)
@@ -21,18 +21,17 @@
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13
-  object pcMain: TPageControl
+  object pnlMain: TPanel
     Left = 0
     Top = 0
     Width = 480
     Height = 640
-    Margins.Left = 0
-    Margins.Top = 0
-    Margins.Right = 0
-    Margins.Bottom = 0
     Align = alClient
-    Style = tsFlatButtons
+    BevelEdges = []
     TabOrder = 0
-    ExplicitLeft = -2
+    ExplicitLeft = 152
+    ExplicitTop = 304
+    ExplicitWidth = 185
+    ExplicitHeight = 41
   end
 end
Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 240)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 241)
@@ -39,13 +39,13 @@
 begin
   inherited;
   UiContext.Toelevering := '';
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject);
@@ -57,13 +57,13 @@
     UiContext.Toelevering := '';
   end;
 
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnTerugClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet);
 end;
 
 procedure TfmBestaandePalletScherm.FormShow(Sender: TObject);
Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 240)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 241)
@@ -62,7 +62,7 @@
 procedure TfmHernoemPalletScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmHernoemPalletScherm.actVolgendeExecute(Sender: TObject);
@@ -171,7 +171,7 @@
     Response.Free;
   end;
   if Self.ModalResult = mrHome then
-    (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
+    (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmHernoemPalletScherm.FormShow(Sender: TObject);
Index: AAPClient/UI/HomeScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/HomeScherm.pas	(.../HomeScherm.pas)	(revision 240)
+++ AAPClient/UI/HomeScherm.pas	(.../HomeScherm.pas)	(revision 241)
@@ -35,25 +35,25 @@
 procedure TfmHomeScherm.actAfsluitenExecute(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin);
 end;
 
 procedure TfmHomeScherm.btnAfmeldenProductenClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet);
 end;
 
 procedure TfmHomeScherm.btnHernoemPalletClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHernoemPallet);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHernoemPallet);
 end;
 
 procedure TfmHomeScherm.btnUitloggenClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin);
 end;
 
 end.
Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 240)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 241)
@@ -42,7 +42,7 @@
 procedure TfmDnaCodeReedsGescandScherm.btnTerugClick(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.btnVerplaatsenClick(Sender: TObject);
@@ -103,7 +103,7 @@
     Response.Free;
   end;
   if Self.ModalResult = mrDnaCode then
-    (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+    (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.Wegnemen;
@@ -118,7 +118,7 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 end.
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 240)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 241)
@@ -58,7 +58,7 @@
 procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject);
@@ -82,7 +82,7 @@
       Self.ModalResult := mrDnaCode;
     end;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer;
@@ -131,7 +131,7 @@
     UiContext.InfoLogSchermToonGescand := true;
     Self.ModalResult := mrInfoLog;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject);
@@ -156,7 +156,7 @@
     end;
 
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.edtDnaCodeKeyPress(Sender: TObject; var Key: Char);
@@ -238,7 +238,7 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.PalletBijwerken(Status: DnaCodeStatus;
@@ -258,7 +258,7 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.ToeleveringDataOphalen;
@@ -281,7 +281,6 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
@@ -346,7 +345,7 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 end.
Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 240)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 241)
@@ -39,7 +39,7 @@
 procedure TfmPalletScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome);
 end;
 
 procedure TfmPalletScherm.actVolgendeExecute(Sender: TObject);
@@ -83,7 +83,7 @@
   end else begin
     Self.ModalResult := mrPallet;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject);
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 240)
+++ AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 241)
@@ -132,8 +132,8 @@
 begin
   PopupScherm := TfmPopupScherm.Create(self);
 
-  PopupScherm.Top := self.parent.parent.parent.ClientOrigin.Y + 40;
-  PopupScherm.Left := self.parent.parent.parent.ClientOrigin.X + 40;
+  PopupScherm.Top := self.parent.ClientOrigin.Y + 40;
+  PopupScherm.Left := self.parent.ClientOrigin.X + 40;
   PopupScherm.lblWaarschuwing.Caption := Melding;
   PopupScherm.lblActie1.Caption := Actie1;
 
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 240)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 241)
@@ -9,7 +9,7 @@
 
 type
   TfmProScanHoofdscherm = class(TForm)
-    pcMain: TPageControl;
+    pnlMain: TPanel;
     procedure FormCreate(Sender: TObject);
     procedure FormActivate(Sender: TObject);
   private
@@ -60,33 +60,26 @@
   TabSheet: TTabSheet;
   pnlMain: TPanel;
 begin
+  Application.ProcessMessages;
+  pnlMain := TPanel.Create(Self);
+  pnlMain.Parent := Self;
+  pnlMain.Align := alClient;
 
-  if pcMain.PageCount > 0 then
-    pcMain.Pages[0].Free;
-  TabSheet := TTabSheet.Create(pcMain);
-  TabSheet.TabVisible := false;
-  TabSheet.PageControl := pcMain;
-  pcMain.ActivePageIndex := 0;
-
   if mr = mrAbort then begin
     HuidigeGebruikerAfmelden;
     Application.Terminate;
   end else begin
     case mr of
-      mrLogin               : fHuidigScherm := TfmLoginScherm2.Create(TabSheet);
-      mrHome                : fHuidigScherm := TfmHomeScherm.Create(TabSheet);
-      mrPallet              : fHuidigScherm := TfmPalletScherm.Create(TabSheet);
-      mrHernoemPallet       : fHuidigScherm := TfmHernoemPalletScherm.Create(TabSheet);
-      mrBestaandePallet     : fHuidigScherm := TfmBestaandePalletScherm.Create(TabSheet);
-      mrDnaCode             : fHuidigScherm := TfmDnaCodeScherm.Create(TabSheet);
-      mrInfoLog             : fHuidigScherm := TfmInfoLogScherm.Create(TabSheet);
-      mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(TabSheet);
+      mrLogin               : fHuidigScherm := TfmLoginScherm2.Create(pnlMain);
+      mrHome                : fHuidigScherm := TfmHomeScherm.Create(pnlMain);
+      mrPallet              : fHuidigScherm := TfmPalletScherm.Create(pnlMain);
+      mrHernoemPallet       : fHuidigScherm := TfmHernoemPalletScherm.Create(pnlMain);
+      mrBestaandePallet     : fHuidigScherm := TfmBestaandePalletScherm.Create(pnlMain);
+      mrDnaCode             : fHuidigScherm := TfmDnaCodeScherm.Create(pnlMain);
+      mrInfoLog             : fHuidigScherm := TfmInfoLogScherm.Create(pnlMain);
+      mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(pnlMain);
     end;
 
-    pnlMain := TPanel.Create(Self);
-    pnlMain.Parent := Self;
-    pnlMain.Align := alClient;
-
     fHuidigScherm.Parent := pnlMain;
     (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
     fHuidigScherm.Show;
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 240)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 241)
@@ -63,7 +63,7 @@
 procedure TfmInfoLogScherm.actTerugExecute(Sender: TObject);
 begin
   inherited;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject);
@@ -86,7 +86,7 @@
       Response.Free;
     end;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmInfoLogScherm.btnEerstClick(Sender: TObject);
Index: AAPClient/UI/LoginScherm2.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 240)
+++ AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 241)
@@ -57,7 +57,8 @@
   finally
     Response.Free;
   end;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
+  PostMessage(Self.Handle,WM_Close,0,0);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult);
 end;
 
 procedure TfmLoginScherm2.edtInitialenKeyUp(Sender: TObject; var Key: Word;
@@ -97,7 +98,7 @@
 begin
   inherited;
   HuidigeGebruikerAfmelden;
-  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrAbort);
+  (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrAbort);
 end;
 
 procedure TfmLoginScherm2.SetContext;
Index: AAPClient/UI/PopupScherm.pas
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 240)
+++ AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 241)
@@ -5,7 +5,7 @@
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Imaging.pngimage,
-  Vcl.ExtCtrls;
+  Vcl.ExtCtrls, DimmerForm;
 
 type
   TfmPopupScherm = class(TForm)
@@ -25,8 +25,9 @@
     procedure imgActie2Click(Sender: TObject);
     procedure lblActie1Click(Sender: TObject);
     procedure lblActie2Click(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
   private
-    { Private declarations }
+    fDimmerForm: TfmDimmerForm;
   public
     { Public declarations }
   end;
@@ -37,13 +38,16 @@
 implementation
 
 uses
-  Images, DimmerForm;
+  Images;
 
 {$R *.dfm}
 
+procedure TfmPopupScherm.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  fDimmerForm.Close;
+end;
+
 procedure TfmPopupScherm.FormShow(Sender: TObject);
-var
-  fDimmerForm: TfmDimmerform;
 begin
   fDimmerForm := TfmDimmerform.Create(Self);
   fDimmerForm.Left := Self.Left - 40;
Index: AAPClient/UI/PopupScherm.dfm
===================================================================
diff -u -r240 -r241
--- AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 240)
+++ AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 241)
@@ -13,6 +13,7 @@
   Font.Style = []
   OldCreateOrder = False
   Position = poDefault
+  OnClose = FormClose
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 19