diff --git a/src/z2ui5_cl_demo_app_000.clas.abap b/src/z2ui5_cl_demo_app_000.clas.abap
index dd8e50d2..b20885f0 100644
--- a/src/z2ui5_cl_demo_app_000.clas.abap
+++ b/src/z2ui5_cl_demo_app_000.clas.abap
@@ -24,11 +24,11 @@
       PROTECTED SECTION.
       PRIVATE SECTION.
 
-ENDCLASS.
+    ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
+    CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
 
 
       METHOD z2ui5_if_app~main.
@@ -151,13 +151,13 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
             mode      = 'LineMode'
             class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom' ).
 
-            panel->generic_tile(
-        header    = 'Event IV'
-        subheader = `Facet Filter - T_arg with Objects`
-        press     = client->_event( 'Z2UI5_CL_DEMO_APP_197' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
+        panel->generic_tile(
+    header    = 'Event IV'
+    subheader = `Facet Filter - T_arg with Objects`
+    press     = client->_event( 'Z2UI5_CL_DEMO_APP_197' )
+    mode      = 'LineMode'
+    class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+).
 
         panel->generic_tile(
         header    = 'Follow Up Action'
@@ -183,13 +183,13 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
             class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
         ).
 
-     panel->generic_tile(
-            header    = 'Timer II'
-            subheader = 'Set Loading Indicator while Server Request'
-            press     = client->_event( 'Z2UI5_CL_DEMO_APP_064' )
-            mode      = 'LineMode'
-            class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-        ).
+        panel->generic_tile(
+               header    = 'Timer II'
+               subheader = 'Set Loading Indicator while Server Request'
+               press     = client->_event( 'Z2UI5_CL_DEMO_APP_064' )
+               mode      = 'LineMode'
+               class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+           ).
 
         panel->generic_tile(
             header    = 'New Tab'
@@ -453,12 +453,12 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
              class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
          ).
 
-       panel->generic_tile(
-            header    = 'Column Menu'
-            press     =  client->_event( 'z2ui5_cl_demo_app_183' )
-            mode      = 'LineMode'
-            class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-        ).
+        panel->generic_tile(
+             header    = 'Column Menu'
+             press     =  client->_event( 'z2ui5_cl_demo_app_183' )
+             mode      = 'LineMode'
+             class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+         ).
 
         panel->generic_tile(
             header    = 'ui.Table I'
@@ -835,7 +835,7 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
 
 
         panel->generic_tile(
-             header    = 'Dynamic Objects'
+             header    = 'Dynamic Objects I'
              subheader = 'Use S-RTTI to render different Subapps'
              press     =  client->_event( 'Z2UI5_CL_DEMO_APP_131' )
              mode      = 'LineMode'
@@ -850,37 +850,14 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
     ).
 
-           panel->generic_tile(
-        header    = 'Dynamic Objects III'
-        subheader = 'User Generic Data Refs in Subapps'
-        press     =  client->_event( 'Z2UI5_CL_DEMO_APP_185' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
-
-               panel->generic_tile(
-        header    = 'Dynamic Objects IV'
-        subheader = 'User Generic Tab Refs in Subapps'
-        press     =  client->_event( 'Z2UI5_CL_DEMO_APP_191' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
-
-               panel->generic_tile(
-        header    = 'Dynamic Objects V'
-        subheader = 'User Generic Struc Refs'
-        press     =  client->_event( 'Z2UI5_CL_DEMO_APP_195' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
+        panel->generic_tile(
+     header    = 'Dynamic Objects III'
+     subheader = 'User Generic Data Refs in Subapps'
+     press     =  client->_event( 'Z2UI5_CL_DEMO_APP_185' )
+     mode      = 'LineMode'
+     class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+ ).
 
-               panel->generic_tile(
-        header    = 'Dynamic Objects VI'
-        subheader = 'User Generic Struc Refs with refresh'
-        press     =  client->_event( 'Z2UI5_CL_DEMO_APP_199' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
 
 
         panel = page->panel(
@@ -1360,20 +1337,20 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
      class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
     ).
 
-            panel->generic_tile(
-        header    = 'Network Graph'
-        press     =  client->_event( 'z2ui5_cl_demo_app_182' )
-        mode      = 'LineMode'
-        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-    ).
+        panel->generic_tile(
+    header    = 'Network Graph'
+    press     =  client->_event( 'z2ui5_cl_demo_app_182' )
+    mode      = 'LineMode'
+    class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+).
 
-            panel->generic_tile(
-         header    = 'Status Indicator Library'
-         subheader = ``
-         press     = client->_event( 'Z2UI5_CL_DEMO_APP_196' )
-         mode      = 'LineMode'
-         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
-     ).
+        panel->generic_tile(
+     header    = 'Status Indicator Library'
+     subheader = ``
+     press     = client->_event( 'Z2UI5_CL_DEMO_APP_196' )
+     mode      = 'LineMode'
+     class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+ ).
 
         panel = page->panel(
         expandable = abap_false
@@ -1472,6 +1449,36 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
               class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
           ).
 
+        panel = page->panel(
+        expandable = abap_false
+        expanded   = abap_true
+        headertext = `For Testing only...`
+    ).
+
+        panel->generic_tile(
+            header    = 'Model I'
+ subheader = 'RTTI Data'
+ press     =  client->_event( 'Z2UI5_CL_DEMO_APP_191' )
+ mode      = 'LineMode'
+ class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+).
+
+        panel->generic_tile(
+ header    = 'Model I'
+ subheader = 'RTTI Data'
+ press     =  client->_event( 'Z2UI5_CL_DEMO_APP_195' )
+ mode      = 'LineMode'
+ class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+).
+
+        panel->generic_tile(
+ header    = 'Model II'
+ subheader = 'RTTI Data'
+ press     =  client->_event( 'Z2UI5_CL_DEMO_APP_199' )
+ mode      = 'LineMode'
+ class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+).
+
         panel = page->panel(
         expandable = abap_false
         expanded   = abap_true
@@ -1490,4 +1497,4 @@ CLASS Z2UI5_CL_DEMO_APP_000 IMPLEMENTATION.
         client->view_display( page->stringify( ) ).
 
       ENDMETHOD.
-ENDCLASS.
+    ENDCLASS.
diff --git a/src/z2ui5_cl_demo_app_122.clas.abap b/src/z2ui5_cl_demo_app_122.clas.abap
index c5410416..8d900cda 100644
--- a/src/z2ui5_cl_demo_app_122.clas.abap
+++ b/src/z2ui5_cl_demo_app_122.clas.abap
@@ -12,7 +12,8 @@ CLASS z2ui5_cl_demo_app_122 DEFINITION
     DATA device_systemtype TYPE string.
     DATA device_os TYPE string.
     DATA device_browser TYPE string.
-    DATA check_initialized TYPE abap_bool .
+    DATA check_initialized TYPE abap_bool.
+    DATA device_system_desktop TYPE abap_bool.
 
   PROTECTED SECTION.
     DATA client TYPE REF TO z2ui5_if_client.
@@ -47,6 +48,7 @@ CLASS z2ui5_cl_demo_app_122 IMPLEMENTATION.
                                         ui5_gav           = client->_bind_edit( ui5_gav )
                                         ui5_theme         = client->_bind_edit( ui5_theme )
                                         ui5_version       = client->_bind_edit( ui5_version )
+                                        device_system_desktop       = client->_bind_edit( device_system_desktop )
               )->simple_form( title = 'Information' editable = abap_true
                   )->content( 'form'
                       )->label( 'device_browser'
@@ -61,6 +63,8 @@ CLASS z2ui5_cl_demo_app_122 IMPLEMENTATION.
                       )->input( client->_bind_edit( ui5_theme )
                       )->label( `ui5_version`
                       )->input( client->_bind_edit( ui5_version )
+                      )->label( `device_system_desktop`
+                      )->input( client->_bind_edit( device_system_desktop )
            )->stringify( ) ).
 
   ENDMETHOD.
diff --git a/src/z2ui5_cl_demo_app_199.clas.abap b/src/z2ui5_cl_demo_app_199.clas.abap
index 850a5a76..da005acb 100644
--- a/src/z2ui5_cl_demo_app_199.clas.abap
+++ b/src/z2ui5_cl_demo_app_199.clas.abap
@@ -96,12 +96,14 @@ CLASS z2ui5_cl_demo_app_199 IMPLEMENTATION.
       on_init( ).
     ENDIF.
 
-    IF mv_counter <> lines( mt_table->* ) AND mv_counter IS NOT INITIAL.
+    FIELD-SYMBOLS <tab> TYPE STANDARD TABLE.
+    ASSIGN mt_table->* TO <tab>.
+    IF mv_counter <> lines( <tab> ) AND mv_counter IS NOT INITIAL.
       client->message_box_display( text = 'Frontend Lines <> Backend!' type = 'error' ).
     ENDIF.
 
     on_event( ).
-    mv_counter = lines( mt_table->*  ).
+    mv_counter = lines( <tab>  ).
 
   ENDMETHOD.