diff --git a/src/00/z2ui5_cl_app_demo_24.clas.abap b/src/00/z2ui5_cl_app_demo_24.clas.abap
index d09cd040..a840880c 100644
--- a/src/00/z2ui5_cl_app_demo_24.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_24.clas.abap
@@ -55,7 +55,10 @@ CLASS Z2UI5_CL_APP_DEMO_24 IMPLEMENTATION.
 
         DATA(view) = client->factory_view( ).
         view->page( title = 'abap2UI5 - flow logic - APP 01' navbuttonpress = client->_event( 'BACK' )
-           )->header_content( )->link( text = 'Source_Code' href = client->get( )-s_request-url_source_code )->get_parent(
+            )->header_content(
+                )->link( text = 'Demo'        href = `https://twitter.com/OblomovDev/status/1640743794206228480`
+                )->link( text = 'Source_Code' href = client->get( )-s_request-url_source_code
+            )->get_parent(
 
            )->grid( 'L6 M12 S12' )->content( 'l'
 
diff --git a/src/00/z2ui5_cl_app_demo_25.clas.abap b/src/00/z2ui5_cl_app_demo_25.clas.abap
index 729490ac..1d59ed23 100644
--- a/src/00/z2ui5_cl_app_demo_25.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_25.clas.abap
@@ -80,9 +80,8 @@ CLASS Z2UI5_CL_APP_DEMO_25 IMPLEMENTATION.
                     title          = 'abap2UI5 - flow logic - APP 02'
                     navbuttonpress = client->_event( 'BACK' )
                 )->header_content(
-                    )->link(
-                        text = 'Source_Code'
-                        href = client->get( )-s_request-url_source_code
+                    )->link( text = 'Demo'        href = `https://twitter.com/OblomovDev/status/1640743794206228480`
+                    )->link( text = 'Source_Code' href = client->get( )-s_request-url_source_code
                 )->get_parent( ).
 
         page->grid( 'L6 M12 S12' )->content( 'l'
@@ -105,9 +104,8 @@ CLASS Z2UI5_CL_APP_DEMO_25 IMPLEMENTATION.
                     title          = 'abap2UI5 - flow logic - APP 02'
                     navbuttonpress = client->_event( 'BACK' )
                 )->header_content(
-                    )->link(
-                        text = 'Source_Code'
-                        href = client->get( )-s_request-url_source_code
+                    )->link( text = 'Demo'        href = `https://twitter.com/OblomovDev/status/1640743794206228480`
+                    )->link( text = 'Source_Code' href = client->get( )-s_request-url_source_code
                 )->get_parent( ).
 
         page->grid( 'L6 M12 S12' )->content( 'l'
diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index ee995d14..507500d7 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -10,18 +10,11 @@ CLASS z2ui5_cl_http_handler DEFINITION
         check_debug_mode TYPE abap_bool VALUE abap_true,
       END OF cs_config.
 
-    TYPES:
-      BEGIN OF ty_s_name_value,
-        name  TYPE string,
-        value TYPE string,
-      END OF ty_s_name_value.
-    TYPES ty_t_name_value TYPE STANDARD TABLE OF ty_s_name_value WITH EMPTY KEY.
-
     CLASS-DATA:
       BEGIN OF client,
         body     TYPE string,
-        t_header TYPE ty_t_name_value,
-        t_param  TYPE ty_t_name_value,
+        t_header TYPE z2ui5_if_client=>ty_t_name_value,
+        t_param  TYPE z2ui5_if_client=>ty_t_name_value,
       END OF client.
 
     "! loads the one page ui5 application
@@ -31,9 +24,9 @@ CLASS z2ui5_cl_http_handler DEFINITION
     "! @parameter r_result | index.html
     CLASS-METHODS main_index_html
       IMPORTING
-        library_path    TYPE string DEFAULT `https://ui5.sap.com/resources/sap-ui-core.js`
-        theme           TYPE string DEFAULT `sap_horizon`
-        title           TYPE string DEFAULT `abap2UI5`
+        library_path    TYPE clike DEFAULT `https://ui5.sap.com/resources/sap-ui-core.js`
+        theme           TYPE clike DEFAULT `sap_horizon`
+        title           TYPE clike DEFAULT `abap2UI5`
       RETURNING
         VALUE(r_result) TYPE string.
 
diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index c04c778c..dae2221c 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -251,7 +251,7 @@ CLASS z2ui5_lcl_utility IMPLEMENTATION.
     DATA(url_segments) = segment( val = get_trim_upper( url ) index = 2 sep = `?` ).
     SPLIT url_segments AT `&` INTO TABLE DATA(lt_params).
 
-    DATA lt_url_params TYPE z2ui5_cl_http_handler=>ty_t_name_value.
+    DATA lt_url_params TYPE z2ui5_if_client=>ty_t_name_value.
 
     LOOP AT lt_params INTO DATA(lv_param).
 
@@ -904,7 +904,7 @@ CLASS z2ui5_lcl_if_view DEFINITION.
 
     DATA m_name TYPE string.
     DATA m_ns   TYPE string.
-    DATA mt_prop TYPE z2ui5_cl_http_handler=>ty_t_name_value.
+    DATA mt_prop TYPE z2ui5_if_client=>ty_t_name_value.
 
     DATA m_root    TYPE REF TO z2ui5_lcl_if_view.
     DATA m_last    TYPE REF TO z2ui5_lcl_if_view.
@@ -972,8 +972,8 @@ CLASS z2ui5_lcl_system_runtime DEFINITION.
     CLASS-DATA:
       BEGIN OF ss_client,
         o_body   TYPE REF TO z2ui5_lcl_utility_tree_json,
-        t_header TYPE z2ui5_cl_http_handler=>ty_t_name_value,
-        t_param  TYPE z2ui5_cl_http_handler=>ty_t_name_value,
+        t_header TYPE z2ui5_if_client=>ty_t_name_value,
+        t_param  TYPE z2ui5_if_client=>ty_t_name_value,
       END OF ss_client.
 
     TYPES:
@@ -1013,7 +1013,7 @@ CLASS z2ui5_lcl_system_runtime DEFINITION.
 
         check_set_prev_view TYPE abap_bool,
 
-        t_scroll_pos        TYPE z2ui5_cl_http_handler=>ty_t_name_value,
+        t_scroll_pos        TYPE z2ui5_if_client=>ty_t_name_value,
         s_cursor_pos        TYPE z2ui5_if_client=>ty_s_cursor,
 
         t_view              TYPE STANDARD TABLE OF s_view WITH EMPTY KEY,