Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r228 -r240
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 228)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 240)
@@ -17,10 +17,6 @@
     procedure FormShow(Sender: TObject);
     procedure btnExtraToeleveringClick(Sender: TObject);
     procedure btnReworkClick(Sender: TObject);
-    procedure imgHuidigeToeleveringClick(Sender: TObject);
-    procedure imgReworkClick(Sender: TObject);
-    procedure imgExtraToeleveringClick(Sender: TObject);
-    procedure imgRechtsOnderClick(Sender: TObject);
     procedure btnHuidigeToeleveringClick(Sender: TObject);
     procedure btnTerugClick(Sender: TObject);
   private
@@ -35,32 +31,39 @@
 implementation
 
 uses
-  UiContext, DnaCodeService, Agent;
+  UiContext, DnaCodeService, Agent, ProScanMain;
 
 {$R *.dfm}
 
 procedure TfmBestaandePalletScherm.btnExtraToeleveringClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrDnaCode;
+  UiContext.Toelevering := '';
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrDnaCode;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrDnaCode;
+  if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) = 1) then begin
+    UiContext.Toelevering := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet).DnaCodes[0].Toelevering;
+  end else if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) > 1) then begin
+    UiContext.Toelevering := '';
+  end;
+
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode);
 end;
 
 procedure TfmBestaandePalletScherm.btnTerugClick(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrPallet;
+  (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet);
 end;
 
 procedure TfmBestaandePalletScherm.FormShow(Sender: TObject);
@@ -72,37 +75,6 @@
   inherited;
 end;
 
-procedure TfmBestaandePalletScherm.imgExtraToeleveringClick(Sender: TObject);
-begin
-  inherited;
-  UiContext.Toelevering := '';
-  Self.ModalResult := mrDnaCode;
-end;
-
-procedure TfmBestaandePalletScherm.imgHuidigeToeleveringClick(Sender: TObject);
-begin
-  inherited;
-  Self.ModalResult := mrDnaCode;
-end;
-
-procedure TfmBestaandePalletScherm.imgRechtsOnderClick(Sender: TObject);
-begin
-  inherited;
-  Self.ModalResult := mrPallet;
-end;
-
-procedure TfmBestaandePalletScherm.imgReworkClick(Sender: TObject);
-begin
-  inherited;
-  if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) = 1) then begin
-    UiContext.Toelevering := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet).DnaCodes[0].Toelevering;
-  end else if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) > 1) then begin
-    UiContext.Toelevering := '';
-  end;
-
-  Self.ModalResult := mrDnaCode;
-end;
-
 function TfmBestaandePalletScherm.BepaalAantalToeleveringenOpPallet(
   PalletCode: string): integer;
 var