Index: AAPClient/UI/DnaCodeScherm.dfm
===================================================================
diff -u -r68 -r77
--- AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 68)
+++ AAPClient/UI/DnaCodeScherm.dfm	(.../DnaCodeScherm.dfm)	(revision 77)
@@ -88,6 +88,7 @@
     ImageAlignment = iaCenter
     ModalResult = 8
     TabOrder = 4
+    OnClick = btnInfoClick
   end
   inherited alAlgemeen: TActionList
     Left = 16
Index: AAPClient/UI/BestaandePalletScherm.dfm
===================================================================
diff -u -r38 -r77
--- AAPClient/UI/BestaandePalletScherm.dfm	(.../BestaandePalletScherm.dfm)	(revision 38)
+++ AAPClient/UI/BestaandePalletScherm.dfm	(.../BestaandePalletScherm.dfm)	(revision 77)
@@ -18,6 +18,7 @@
     ModalResult = 2
     TabOrder = 3
     WordWrap = True
+    OnClick = btnExtraToeleveringClick
   end
   object btnRework: TButton [6]
     Left = 56
@@ -28,6 +29,7 @@
     ModalResult = 4
     TabOrder = 4
     WordWrap = True
+    OnClick = btnReworkClick
   end
   inherited alAlgemeen: TActionList
     inherited actHome: TAction
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r69 -r77
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 69)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 77)
@@ -24,6 +24,7 @@
     procedure actPalletExecute(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
     procedure actVolgendeExecute(Sender: TObject);
+    procedure btnInfoClick(Sender: TObject);
   private
     { Private declarations }
   public
@@ -36,20 +37,20 @@
 implementation
 
 uses
-  DnaCodeService;
+  DnaCodeService, UiContext;
 
 {$R *.dfm}
 
 procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  //
+  Self.ModalResult := mrHome;
 end;
 
 procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject);
 begin
   inherited;
-  //
+  Self.ModalResult := mrPallet;
 end;
 
 procedure TfmDnaCodeScherm.actVolgendeExecute(Sender: TObject);
@@ -75,7 +76,7 @@
     Response := Service.DnaCodeAfmelden(Request);
     try
       if Response.Header.Status <> '200' then begin
-        Self.ModalResult := mrRetry;
+        Self.ModalResult := mrDnaCode;
         ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw')
       end else begin
         UiContext.Toelevering := Response.DnaCodes[0].Toelevering;
@@ -87,7 +88,7 @@
           imgGls.Visible := Response.DnaCodes[0].IsGlsDirect;
         end;
         lblLaatstGescandData.Caption := Request.DnaCode;
-        Self.ModalResult := mrIgnore;
+        Self.ModalResult := mrDnaCode;
       end;
     finally
       Response.Free;
@@ -97,6 +98,12 @@
   end;
 end;
 
+procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject);
+begin
+  inherited;
+  Self.ModalResult := mrInfoLog;
+end;
+
 procedure TfmDnaCodeScherm.FormShow(Sender: TObject);
 begin
   btnLinksOnder.Action := actPallet;
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r76 -r77
--- AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 76)
+++ AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 77)
@@ -8,6 +8,7 @@
   mrPallet          = 103;
   mrBestaandePallet = 104;
   mrDnaCode         = 105;
+  mrInfoLog         = 106;
 
 type
   TUiContext = class
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r76 -r77
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 76)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 77)
@@ -119,33 +119,33 @@
 
     //BestaandePalletScherm tonen
     if fHuidigScherm.ClassType = TfmBestaandePalletScherm then begin
-      if fHuidigScherm.ModalResult = mrYes then begin
+      if fHuidigScherm.ModalResult = mrHome then begin
         fHuidigScherm := fHomeScherm;
       end
-      else if fHuidigScherm.ModalResult = mrOk then begin
+      else if fHuidigScherm.ModalResult = mrPallet then begin
         fHuidigScherm := fPalletScherm;
       end
       else if fHuidigScherm.ModalResult = mrRetry then begin
         ShowMessage('DnaCodeGevuld scherm');
       end
-      else if fHuidigScherm.ModalResult = mrCancel then begin
+      else if fHuidigScherm.ModalResult = mrDnaCode then begin
         fHuidigScherm := fDnaCodeScherm;
       end;
       continue;
     end;
 
     //DnaCodeScherm tonen
     if fHuidigScherm.ClassType = TfmDnaCodeScherm then begin
-      if fHuidigScherm.ModalResult = mrYes then begin
+      if fHuidigScherm.ModalResult = mrHome then begin
         fHuidigScherm := fHomeScherm;
       end
-      else if fHuidigScherm.ModalResult = mrOk then begin
+      else if fHuidigScherm.ModalResult = mrPallet then begin
         fHuidigScherm := fPalletScherm;
       end
-      else if fHuidigScherm.ModalResult = mrNone then begin
+      else if fHuidigScherm.ModalResult = mrDnaCode then begin
         fHuidigScherm := fDnaCodeScherm;
       end
-      else if fHuidigScherm.ModalResult = mrClose then begin
+      else if fHuidigScherm.ModalResult = mrInfoLog then begin
         fHuidigScherm := fInfoLogScherm;
       end;
       continue;
@@ -156,7 +156,7 @@
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fInfoLogScherm;
       end
-      else if fHuidigScherm.ModalResult = mrOk then begin
+      else if fHuidigScherm.ModalResult = mrDnaCode then begin
         fHuidigScherm := fDnaCodeScherm;
       end
       else if fHuidigScherm.ModalResult = mrNone then begin
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r69 -r77
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 69)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 77)
@@ -40,7 +40,7 @@
 procedure TfmInfoLogScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  Self.ModalResult := mrOk;
+  Self.ModalResult := mrDnaCode;
 end;
 
 procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject);
Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u -r68 -r77
--- AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 68)
+++ AAPClient/UI/BestaandePalletScherm.pas	(.../BestaandePalletScherm.pas)	(revision 77)
@@ -15,6 +15,8 @@
     procedure FormShow(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
     procedure actPalletExecute(Sender: TObject);
+    procedure btnExtraToeleveringClick(Sender: TObject);
+    procedure btnReworkClick(Sender: TObject);
   private
     { Private declarations }
   public
@@ -26,17 +28,32 @@
 
 implementation
 
+uses
+  UiContext;
+
 {$R *.dfm}
 
 procedure TfmBestaandePalletScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  //
+  Self.ModalResult := mrHome;
 end;
 
 procedure TfmBestaandePalletScherm.actPalletExecute(Sender: TObject);
 begin
   inherited;
+  Self.ModalResult := mrPallet;
+end;
+
+procedure TfmBestaandePalletScherm.btnExtraToeleveringClick(Sender: TObject);
+begin
+  inherited;
+  Self.ModalResult := mrDnaCode;
+end;
+
+procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject);
+begin
+  inherited;
   //
 end;