diff --git a/src/z2ui5_cl_demo_app_200.clas.abap b/src/z2ui5_cl_demo_app_200.clas.abap
new file mode 100644
index 00000000..00d30f70
--- /dev/null
+++ b/src/z2ui5_cl_demo_app_200.clas.abap
@@ -0,0 +1,196 @@
+CLASS z2ui5_cl_demo_app_200 DEFINITION
+  PUBLIC
+  CREATE PUBLIC.
+
+  PUBLIC SECTION.
+    INTERFACES z2ui5_if_app.
+
+    DATA mt_table  TYPE REF TO data.
+    DATA ms_layout TYPE z2ui5_cl_pop_layout_v2=>ty_s_layout.
+
+  PROTECTED SECTION.
+    DATA client            TYPE REF TO z2ui5_if_client.
+    DATA check_initialized TYPE abap_bool.
+
+    METHODS on_init.
+    METHODS on_event.
+    METHODS render_main.
+    METHODS get_data.
+    METHODS init_layout.
+    METHODS on_after_navigation.
+
+  PRIVATE SECTION.
+
+ENDCLASS.
+
+
+CLASS z2ui5_cl_demo_app_200 IMPLEMENTATION.
+
+  METHOD on_event.
+
+    CASE client->get( )-event.
+
+      WHEN 'BACK'.
+        client->nav_app_leave( client->get_app( client->get( )-s_draft-id_prev_app_stack ) ).
+
+      WHEN OTHERS.
+
+        client = z2ui5_cl_pop_layout_v2=>on_event_layout( client = client
+                                                          layout = ms_layout ).
+
+    ENDCASE.
+  ENDMETHOD.
+
+  METHOD on_init.
+
+    get_data( ).
+
+    init_layout( ).
+
+    render_main( ).
+  ENDMETHOD.
+
+  METHOD render_main.
+
+    FIELD-SYMBOLS <tab> TYPE data.
+
+    DATA(view) = z2ui5_cl_xml_view=>factory( ). "->shell( ).
+
+    DATA(page) = view->page( title          = 'Layout'
+                             navbuttonpress = client->_event( 'BACK' )
+                             shownavbutton  = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL )
+                             class          = 'sapUiContentPadding' ).
+
+    page->header_content( )->scroll_container( height   = '70%'
+                                               vertical = abap_true ).
+
+    ASSIGN mt_table->* TO <tab>.
+
+    DATA(table) = page->table( growing = 'true'
+                               width   = 'auto'
+                               items   = client->_bind_edit( val = <tab> ) ).
+
+    " TODO: variable is assigned but never used (ABAP cleaner)
+    DATA(headder) = table->header_toolbar(
+               )->overflow_toolbar(
+                 )->toolbar_spacer( ).
+
+    headder = z2ui5_cl_pop_layout_v2=>render_layout_function( xml    = headder
+                                                              client = client ).
+
+    DATA(columns) = table->columns( ).
+
+    LOOP AT ms_layout-t_layout REFERENCE INTO DATA(layout).
+      DATA(lv_index) = sy-tabix.
+
+      columns->column( visible         = client->_bind( val       = layout->visible
+                                                        tab       = ms_layout-t_layout
+                                                        tab_index = lv_index )
+                       halign          = client->_bind( val       = layout->halign
+                                                        tab       = ms_layout-t_layout
+                                                        tab_index = lv_index )
+                       importance      = client->_bind( val       = layout->importance
+                                                        tab       = ms_layout-t_layout
+                                                        tab_index = lv_index )
+                       mergeduplicates = client->_bind( val       = layout->merge
+                                                        tab       = ms_layout-t_layout
+                                                        tab_index = lv_index )
+                       width           = client->_bind( val       = layout->width
+                                                        tab       = ms_layout-t_layout
+                                                        tab_index = lv_index )
+
+       )->text( layout->tlabel ).
+
+    ENDLOOP.
+
+    DATA(cells) = columns->get_parent( )->items(
+                                       )->column_list_item( valign = 'Middle'
+                                                            type   = 'Navigation'
+
+                                       )->cells( ).
+
+    LOOP AT ms_layout-t_layout REFERENCE INTO layout.
+
+      cells->object_identifier( text = |\{{ layout->fname }\}| ).
+
+    ENDLOOP.
+
+    client->view_display( view->stringify( ) ).
+
+  ENDMETHOD.
+
+  METHOD z2ui5_if_app~main.
+    me->client = client.
+
+    IF check_initialized = abap_false.
+      check_initialized = abap_true.
+      on_init( ).
+    ENDIF.
+
+    on_event( ).
+
+    on_after_navigation( ).
+
+  ENDMETHOD.
+
+  METHOD get_data.
+    TYPES ty_t_01 TYPE STANDARD TABLE OF z2ui5_t_01.
+
+    FIELD-SYMBOLS <table> TYPE STANDARD TABLE.
+
+    TRY.
+
+        CREATE DATA mt_table TYPE ty_t_01.
+        ASSIGN mt_table->* TO <table>.
+
+        SELECT id,
+               id_prev,
+               id_prev_app,
+               id_prev_app_stack,
+               uname
+          FROM z2ui5_t_01
+          INTO CORRESPONDING FIELDS OF TABLE @<table>
+          UP TO 5 ROWS.
+
+      CATCH cx_root.
+    ENDTRY.
+  ENDMETHOD.
+
+  METHOD init_layout.
+
+    IF ms_layout IS NOT INITIAL.
+      RETURN.
+    ENDIF.
+
+    DATA(class) = cl_abap_classdescr=>get_class_name( me ).
+    SHIFT class LEFT DELETING LEADING '\CLASS='.
+
+    ms_layout = z2ui5_cl_pop_layout_v2=>init_layout( control  = z2ui5_cl_pop_layout_v2=>m_table
+                                                     data     = mt_table
+                                                     handle01 = CONV #( class )
+                                                     handle02 = CONV #( 'z2ui5_t_01' )
+                                                     handle03 = ''
+                                                     handle04 = '' ).
+
+  ENDMETHOD.
+
+  METHOD on_after_navigation.
+
+    IF client->get( )-check_on_navigated = abap_false.
+      RETURN.
+    ENDIF.
+
+    TRY.
+
+        DATA(app) = CAST z2ui5_cl_pop_layout_v2( client->get_app( client->get( )-s_draft-id_prev_app ) ).
+
+        ms_layout = app->ms_layout.
+
+        client->view_model_update( ).
+
+      CATCH cx_root.
+    ENDTRY.
+
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/z2ui5_cl_demo_app_200.clas.xml b/src/z2ui5_cl_demo_app_200.clas.xml
new file mode 100644
index 00000000..7e46653d
--- /dev/null
+++ b/src/z2ui5_cl_demo_app_200.clas.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>Z2UI5_CL_DEMO_APP_200</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>Table Layout</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>