Index: VerpakkingsDefinitie/UI/GevondenProductenScherm.pas
===================================================================
diff -u -r591 -r592
--- VerpakkingsDefinitie/UI/GevondenProductenScherm.pas	(.../GevondenProductenScherm.pas)	(revision 591)
+++ VerpakkingsDefinitie/UI/GevondenProductenScherm.pas	(.../GevondenProductenScherm.pas)	(revision 592)
@@ -23,7 +23,7 @@
     FProductsAgent: TProductsAgent;
     procedure UpdateGui(Sender: TObject);
   public
-    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
+    Constructor Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
       ProductSubject: TSubject; ProductsAgent: TProductsAgent);
   end;
 
@@ -33,7 +33,7 @@
 
 uses SelectService;
 
-constructor TFormGevondenProducten.Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
+constructor TFormGevondenProducten.Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
   ProductSubject: TSubject; ProductsAgent: TProductsAgent);
 begin
   inherited Create(AOwner, Navigator, ApplicationContext);
Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dproj
===================================================================
diff -u -r588 -r592
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 588)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 592)
@@ -121,6 +121,10 @@
 			<DCCReference Include="UI\CheckCombo.pas"/>
 			<DCCReference Include="WS\UI_Data.pas"/>
 			<DCCReference Include="UI\CustomPanelVerpakkingParameter.pas"/>
+			<DCCReference Include="UI\NavProductScherm.pas">
+				<Form>FormProductNav</Form>
+				<FormType>dfm</FormType>
+			</DCCReference>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>
Index: VerpakkingsDefinitie/Main.pas
===================================================================
diff -u -r591 -r592
--- VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 591)
+++ VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 592)
@@ -43,8 +43,7 @@
 implementation
 
 uses
-  Subscherm, NavGridPanel, Util,
-  LogInScherm, ZoekProductenScherm, GebruikerScherm, GevondenProductenScherm, ProductDetailScherm;
+  Util, LogInScherm, NavProductScherm;
 
 {$R *.dfm}
 
@@ -68,7 +67,6 @@
 procedure TFormMain.NavigeerNaar(schermId: Integer);
 var
   NieuwScherm: TControl;
-  NavGridPanelStandard: TNavGridPanelStandard;
 begin
   Application.ProcessMessages; // Interrupts the execution of an application so that it can process the message queue.
 
@@ -79,24 +77,7 @@
 
   case schermId of
     NAVHOME, NAVZOEKPRODUCTEN:
-      begin
-        { TODO -cUI : Onderzoeken of 'TSplitter' een beter alternatief is dan volledig een gridview }
-
-        // Gebruikersgegevens scherm, zoekscherm, resultaten en detail scherm inladen.
-        NavGridPanelStandard := TNavGridPanelStandard.Create(PanelMain);
-        NieuwScherm := NavGridPanelStandard;
-        FProductsAgent.LaadUIInstellingen(FAppContext.UserContext, FAppContext.UiInstellingenContext);
-
-        // Gebruikersgegevens scherm bovenaan
-        // Zoekscherm daaronder links
-        // Resultaten scherm daaronder links
-        // Rechts is helemaal voor detail scherm
-        NavGridPanelStandard.Init(TFormGebruiker.Create(NavGridPanelStandard, Self, FAppContext, FAppContext.UserContext,
-            FUserAgent), TFormZoekProducten.Create(NavGridPanelStandard, Self, FAppContext, FProductsAgent),
-          TFormGevondenProducten.Create(NavGridPanelStandard, Self, FAppContext, FAppContext.ProductsContext, FProductsAgent),
-          TFormProductDetail.Create(NavGridPanelStandard, Self, FAppContext, FAppContext.ProductVerpakkingContext));
-      end;
-
+      NieuwScherm := TFormProductNav.Create(PanelMain, Self, FAppContext, FUserAgent, FProductsAgent);
     NAVLOGIN:
       NieuwScherm := TFormLogin.Create(PanelMain, Self, FAppContext, FUserAgent);
   else
Index: VerpakkingsDefinitie/UI/NavProductScherm.pas
===================================================================
diff -u
--- VerpakkingsDefinitie/UI/NavProductScherm.pas	(revision 0)
+++ VerpakkingsDefinitie/UI/NavProductScherm.pas	(revision 592)
@@ -0,0 +1,64 @@
+unit NavProductScherm;
+
+interface
+
+uses
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ExtCtrls,
+  Subscherm, Main, ApplicationContext, ProductsAgent, UserAgent;
+
+type
+  TFormProductNav = class(TFormSubscherm, INavigator)
+    PanelMain: TPanel;
+  private
+    FUserAgent: TUserAgent;
+    FProductsAgent: TProductsAgent;
+  public
+    constructor Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
+  UserAgent: TUserAgent; ProductsAgent: TProductsAgent);
+    procedure NavigeerNaar(schermId: Integer);
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  NavGridPanel, Util,
+  ZoekProductenScherm, GebruikerScherm, GevondenProductenScherm, ProductDetailScherm;
+
+constructor TFormProductNav.Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
+  UserAgent: TUserAgent; ProductsAgent: TProductsAgent);
+var
+  NavGridPanelStandard: TNavGridPanelStandard;
+begin
+  inherited Create(AOwner, Navigator, ApplicationContext);
+  self.FUserAgent := UserAgent;
+  self.FProductsAgent := ProductsAgent;
+  { TODO -cUI : Onderzoeken of 'TSplitter' een beter alternatief is dan volledig een gridview }
+
+  // Gebruikersgegevens scherm, zoekscherm, resultaten en detail scherm inladen.
+  NavGridPanelStandard := TNavGridPanelStandard.Create(PanelMain);
+  FProductsAgent.LaadUIInstellingen(ApplicationContext.UserContext, ApplicationContext.UiInstellingenContext);
+
+  // Gebruikersgegevens scherm bovenaan
+  // Zoekscherm daaronder links
+  // Resultaten scherm daaronder links
+  // Rechts is helemaal voor detail scherm
+  NavGridPanelStandard.Init(TFormGebruiker.Create(NavGridPanelStandard, self, ApplicationContext, ApplicationContext.UserContext,
+      FUserAgent), TFormZoekProducten.Create(NavGridPanelStandard, self, ApplicationContext, FProductsAgent),
+    TFormGevondenProducten.Create(NavGridPanelStandard, self, ApplicationContext, ApplicationContext.ProductsContext,
+      FProductsAgent), TFormProductDetail.Create(NavGridPanelStandard, self, ApplicationContext,
+      ApplicationContext.ProductVerpakkingContext));
+
+  NavGridPanelStandard.Parent := PanelMain;
+  NavGridPanelStandard.Align := alClient;
+  NavGridPanelStandard.Show;
+end;
+
+procedure TFormProductNav.NavigeerNaar(schermId: Integer);
+begin
+
+end;
+
+end.
Index: VerpakkingsDefinitie/UI/NavProductScherm.dfm
===================================================================
diff -u
--- VerpakkingsDefinitie/UI/NavProductScherm.dfm	(revision 0)
+++ VerpakkingsDefinitie/UI/NavProductScherm.dfm	(revision 592)
@@ -0,0 +1,27 @@
+object FormProductNav: TFormProductNav
+  Left = 0
+  Top = 0
+  Caption = 'FormProductNav'
+  ClientHeight = 299
+  ClientWidth = 635
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  DesignSize = (
+    635
+    299)
+  PixelsPerInch = 96
+  TextHeight = 13
+  object PanelMain: TPanel
+    Left = 0
+    Top = 0
+    Width = 633
+    Height = 305
+    Anchors = [akLeft, akTop, akRight, akBottom]
+    TabOrder = 0
+  end
+end
Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.pas
===================================================================
diff -u -r576 -r592
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(.../ZoekProductenScherm.pas)	(revision 576)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(.../ZoekProductenScherm.pas)	(revision 592)
@@ -57,15 +57,15 @@
     procedure VerwerkOpzoeking();
     procedure ComboBoxBeperkUpdatet(ComboBox: TComboBox; EditText: TEdit);
   public
-    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
+    Constructor Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
       ProductAgent: TProductsAgent);
   end;
 
 implementation
 
 {$R *.dfm}
 
-constructor TFormZoekProducten.Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
+constructor TFormZoekProducten.Create(AOwner: TComponent; Navigator: INavigator; ApplicationContext: TApplicationContext;
   ProductAgent: TProductsAgent);
 begin
   inherited Create(AOwner, Navigator, ApplicationContext);
@@ -148,12 +148,9 @@
   else
     raise Exception.Create('Ongeldige waarde geselecteerd');
 
-  // FProductsAgent.ZoekOp(ApplicationContext.UserContext, ApplicationContext.ProductsContext, TZoekMethode.KortTekst,
-  // EditZoekKortTekst.text, KlantNummer, LeveranciersNummer, '', '');
+   FProductsAgent.ZoekOp(ApplicationContext.UserContext, ApplicationContext.ProductsContext, TZoekMethode.KortTekst,
+   EditZoekKortTekst.text, KlantNummer, LeveranciersNummer, '', '');
 
-  FProductsAgent.ZoekOp(ApplicationContext.UserContext, ApplicationContext.ProductsContext, TZoekMethode.KortTekst,
-    'TA#ERINGS01CUBIMAX R XX', KlantNummer, LeveranciersNummer, '', '');
-
   VerwerkOpzoeking();
 end;
 
Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dpr
===================================================================
diff -u -r588 -r592
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dpr	(.../VerpakkingsDefinitie.dpr)	(revision 588)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dpr	(.../VerpakkingsDefinitie.dpr)	(revision 592)
@@ -20,7 +20,8 @@
   ProductDetailScherm in 'UI\ProductDetailScherm.pas' {FormProductDetail},
   CheckCombo in 'UI\CheckCombo.pas',
   UI_Data in 'WS\UI_Data.pas',
-  CustomPanelVerpakkingParameter in 'UI\CustomPanelVerpakkingParameter.pas';
+  CustomPanelVerpakkingParameter in 'UI\CustomPanelVerpakkingParameter.pas',
+  NavProductScherm in 'UI\NavProductScherm.pas' {FormProductNav};
 
 {$R *.res}
 
Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm
===================================================================
diff -u -r575 -r592
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(.../ZoekProductenScherm.dfm)	(revision 575)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(.../ZoekProductenScherm.dfm)	(revision 592)
@@ -96,6 +96,10 @@
     object TabSheetIdentificatieNr: TTabSheet
       Caption = '(I) Identificatie nr'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Label3: TLabel
         Left = 3
         Top = 10
@@ -131,6 +135,10 @@
     object TabSheetLeveranciersRef: TTabSheet
       Caption = '(R) Leveranciers ref'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Label4: TLabel
         Left = 3
         Top = 10
@@ -202,6 +210,10 @@
     object TabSheetTekst: TTabSheet
       Caption = '(T) Tekst'
       ImageIndex = 3
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Label7: TLabel
         Left = 3
         Top = 10