diff --git a/src/z2ui5_cl_pop_displ_f4_help.clas.abap b/src/z2ui5_cl_pop_displ_f4_help.clas.abap
index c2d5426..8af5ab2 100644
--- a/src/z2ui5_cl_pop_displ_f4_help.clas.abap
+++ b/src/z2ui5_cl_pop_displ_f4_help.clas.abap
@@ -254,8 +254,12 @@ CLASS z2ui5_cl_pop_displ_f4_help IMPLEMENTATION.
                  )->title( mv_check_tab
                  )->toolbar_spacer( ).
 
-    headder = z2ui5_cl_pop_display_layout=>render_layout_function( xml    = headder
-                                                              client = client ).
+
+    headder = z2ui5_cl_pop_display_layout=>render_layout_function(
+                xml    = headder
+                client = client
+                layout = mo_layout
+             ).
 
     DATA(columns) = table->columns( ).
 
@@ -458,10 +462,10 @@ CLASS z2ui5_cl_pop_displ_f4_help IMPLEMENTATION.
     class = cl_abap_classdescr=>get_class_name( me ).
     SHIFT class LEFT DELETING LEADING '\CLASS='.
 
-    z2ui5_cl_pop_display_layout=>init_layout( control  = z2ui5_cl_layout=>m_table
+    mo_layout = z2ui5_cl_layout=>factory( control  = z2ui5_cl_layout=>m_table
                                               data     = mt_data
-                                              handle01 = CONV #( class )
-                                              handle02 = CONV #( mv_table )
+                                              handle01 = class
+                                              handle02 = mv_table
                                               handle03 =  'F4'  ).
 
   ENDMETHOD.