diff --git a/src/00/z2ui5_cl_app_demo_00.clas.abap b/src/00/z2ui5_cl_app_demo_00.clas.abap
index 66851308..d299c141 100644
--- a/src/00/z2ui5_cl_app_demo_00.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_00.clas.abap
@@ -83,7 +83,7 @@ CLASS Z2UI5_CL_APP_DEMO_00 IMPLEMENTATION.
     grid->simple_form( title = 'HowTo - Messages' layout = 'ResponsiveGridLayout' )->content( 'form'
         )->button( text = 'Toast, Box & Strip'   press = client->_event( 'z2ui5_cl_app_demo_08' )
         )->button( text = 'Illustrated Message'  press = client->_event( 'z2ui5_cl_app_demo_33' )
-        )->button( text = 'T100 & bapiret popup' press = client->_event( 'z2ui5_cl_app_demo_34' )
+*        )->button( text = 'T100 & bapiret popup' press = client->_event( 'z2ui5_cl_app_demo_34' )
         )->button( text = 'Message Manager'      press = client->_event( 'z2ui5_cl_app_demo_38' )
     ).
 
diff --git a/src/00/z2ui5_cl_app_demo_23.clas.abap b/src/00/z2ui5_cl_app_demo_23.clas.abap
index a71b41da..588fcefa 100644
--- a/src/00/z2ui5_cl_app_demo_23.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_23.clas.abap
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_23 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_23 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -79,7 +79,7 @@ CLASS Z2UI5_CL_APP_DEMO_23 IMPLEMENTATION.
 
   METHOD z2ui5_on_render_main.
 
-    DATA(lo_view) = Z2UI5_CL_XML_VIEW=>factory( ).
+    DATA(lo_view) = z2ui5_cl_xml_view=>factory( ).
 
     CASE app-view_main.
 
@@ -116,7 +116,7 @@ CLASS Z2UI5_CL_APP_DEMO_23 IMPLEMENTATION.
                               `  text="XML" ` && |\n|  &&
                               ` /></f:content></f:SimpleForm></Page></Shell></mvc:View>`.
 
-        app-s_next-xml_main = lv_xml.
+        app-s_next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( lv_xml ).
 
       WHEN 'NORMAL'.
 
@@ -128,7 +128,7 @@ CLASS Z2UI5_CL_APP_DEMO_23 IMPLEMENTATION.
               )->header_content(
                   )->link(
                       text = 'Source_Code'
-                      href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
+                      href = z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) )
                       target = '_blank'
               )->get_parent(
               )->simple_form( 'Form Title'
diff --git a/src/00/z2ui5_cl_app_demo_24.clas.abap b/src/00/z2ui5_cl_app_demo_24.clas.abap
index 2cb37dbc..671660f3 100644
--- a/src/00/z2ui5_cl_app_demo_24.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_24.clas.abap
@@ -39,7 +39,8 @@ CLASS Z2UI5_CL_APP_DEMO_24 IMPLEMENTATION.
         client->nav_app_call( lo_app_next  ).
 
       WHEN 'BACK'.
-        client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
+        data(lo_prev_stack_app) = client->get_app( client->get( )-id_prev_app_stack ).
+        client->nav_app_leave( lo_prev_stack_app ).
 
       WHEN OTHERS.
         CASE mv_backend_event.
diff --git a/src/00/z2ui5_cl_app_demo_31.clas.abap b/src/00/z2ui5_cl_app_demo_31.clas.abap
index 09dc8e3c..fdddf535 100644
--- a/src/00/z2ui5_cl_app_demo_31.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_31.clas.abap
@@ -161,6 +161,7 @@ CLASS Z2UI5_CL_APP_DEMO_31 IMPLEMENTATION.
                         `   </GenericTile>` && |\n|  &&
                         `</mvc:View>`.
 
+     app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
 
   ENDMETHOD.
 
diff --git a/src/00/z2ui5_cl_app_demo_32.clas.abap b/src/00/z2ui5_cl_app_demo_32.clas.abap
index cdac6020..2274473c 100644
--- a/src/00/z2ui5_cl_app_demo_32.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_32.clas.abap
@@ -4,18 +4,18 @@ CLASS z2ui5_cl_app_demo_32 DEFINITION PUBLIC.
 
     INTERFACES z2ui5_if_app.
 
-    data mv_value type string.
+    DATA mv_value TYPE string.
 
   PROTECTED SECTION.
 
-    data client TYPE REF TO z2ui5_if_client.
+    DATA client TYPE REF TO z2ui5_if_client.
     DATA:
       BEGIN OF app,
         check_initialized TYPE abap_bool,
         view_main         TYPE string,
         view_popup        TYPE string,
-        get             TYPE z2ui5_if_client=>ty_s_get,
-        next            TYPE z2ui5_if_client=>ty_s_next,
+        get               TYPE z2ui5_if_client=>ty_s_get,
+        next              TYPE z2ui5_if_client=>ty_s_next,
       END OF app.
 
     METHODS z2ui5_on_init.
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_32 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_32 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -61,7 +61,7 @@ CLASS Z2UI5_CL_APP_DEMO_32 IMPLEMENTATION.
       WHEN 'POST'.
         client->popup_message_toast( app-get-event_data ).
 
-         WHEN 'MYCC'.
+      WHEN 'MYCC'.
         client->popup_message_toast( 'MYCC event ' && mv_value ).
 
       WHEN 'BACK'.
@@ -89,7 +89,7 @@ CLASS Z2UI5_CL_APP_DEMO_32 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<html><head><style>` && |\n|  &&
                           `body {background-color: powderblue;}` && |\n|  &&
                           `h1   {color: blue;}` && |\n|  &&
@@ -107,5 +107,7 @@ CLASS Z2UI5_CL_APP_DEMO_32 IMPLEMENTATION.
                           `</html> ` && |\n|  &&
                             `</mvc:View>`.
 
+    app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
+
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_33.clas.abap b/src/00/z2ui5_cl_app_demo_33.clas.abap
index e7702944..8871d7e0 100644
--- a/src/00/z2ui5_cl_app_demo_33.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_33.clas.abap
@@ -3,7 +3,7 @@ CLASS z2ui5_cl_app_demo_33 DEFINITION PUBLIC.
   PUBLIC SECTION.
 
     INTERFACES z2ui5_if_app.
-
+    data mv_type type string.
   PROTECTED SECTION.
   PRIVATE SECTION.
 ENDCLASS.
@@ -16,15 +16,17 @@ CLASS Z2UI5_CL_APP_DEMO_33 IMPLEMENTATION.
   METHOD z2ui5_if_app~controller.
 
     CASE client->get( )-event.
-      WHEN 'BUTTON_MESSAGE_BOX'.
-        client->popup_message_box( 'this is a message box' ).
       WHEN 'BACK'.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
+
+      when others.
+      mv_type = client->get( )-event.
+
     ENDCASE.
 
     DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
         )->page(
-            title          = 'abap2UI5 - Messages'
+            title          = 'abap2UI5 - Illustrated Messages'
             navbuttonpress = client->_event( 'BACK' )
               shownavbutton = abap_true
             )->header_content(
@@ -32,9 +34,13 @@ CLASS Z2UI5_CL_APP_DEMO_33 IMPLEMENTATION.
                     text = 'Source_Code'  target = '_blank'
                     href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
-
-    page->illustrated_message(
-        illustrationtype             = 'sapIllus-NoActivities'
+    page->link( text = 'Documentation'  target = '_blank' href = `https://openui5.hana.ondemand.com/api/sap.m.IllustratedMessageType#properties` ).
+    page->button( text = 'NoActivities' press = client->_event( 'sapIllus-NoActivities' ) ).
+    page->button( text = 'AddPeople' press = client->_event( 'sapIllus-AddPeople' ) ).
+    page->button( text = 'Connection' press = client->_event( 'sapIllus-Connection' ) ).
+    page->button( text = 'NoDimensionsSet' press = client->_event( 'sapIllus-NoDimensionsSet' ) ).
+    page->button( text = 'NoEntries' press = client->_event( 'sapIllus-NoEntries' ) ).
+    page->illustrated_message( illustrationtype = mv_type
     )->additional_content(  )->button(
                 text  = 'information'
                 press = client->_event( 'BUTTON_MESSAGE_BOX' ) ).
diff --git a/src/00/z2ui5_cl_app_demo_36.clas.abap b/src/00/z2ui5_cl_app_demo_36.clas.abap
index 67d3aad8..a714e05c 100644
--- a/src/00/z2ui5_cl_app_demo_36.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_36.clas.abap
@@ -4,18 +4,18 @@ CLASS z2ui5_cl_app_demo_36 DEFINITION PUBLIC.
 
     INTERFACES z2ui5_if_app.
 
-    data mv_value type string.
+    DATA mv_value TYPE string.
 
   PROTECTED SECTION.
 
-    data client TYPE REF TO z2ui5_if_client.
+    DATA client TYPE REF TO z2ui5_if_client.
     DATA:
       BEGIN OF app,
         check_initialized TYPE abap_bool,
         view_main         TYPE string,
         view_popup        TYPE string,
-        get             TYPE z2ui5_if_client=>ty_s_get,
-        next            TYPE z2ui5_if_client=>ty_s_next,
+        get               TYPE z2ui5_if_client=>ty_s_get,
+        next              TYPE z2ui5_if_client=>ty_s_next,
       END OF app.
 
     METHODS z2ui5_on_init.
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_36 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_36 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -61,7 +61,7 @@ CLASS Z2UI5_CL_APP_DEMO_36 IMPLEMENTATION.
       WHEN 'POST'.
         client->popup_message_toast( app-get-event_data ).
 
-         WHEN 'MYCC'.
+      WHEN 'MYCC'.
         client->popup_message_toast( 'MYCC event ' && mv_value ).
 
       WHEN 'BACK'.
@@ -89,7 +89,7 @@ CLASS Z2UI5_CL_APP_DEMO_36 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<html><head><style>` && |\n|  &&
                           `body {background-color: powderblue;}` && |\n|  &&
                           `h1   {color: blue;}` && |\n|  &&
@@ -137,7 +137,7 @@ CLASS Z2UI5_CL_APP_DEMO_36 IMPLEMENTATION.
                           `</html> ` && |\n|  &&
                             `</mvc:View>`.
 
-
+    app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
 
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_37.clas.abap b/src/00/z2ui5_cl_app_demo_37.clas.abap
index 7312fb23..56ffe09d 100644
--- a/src/00/z2ui5_cl_app_demo_37.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_37.clas.abap
@@ -34,7 +34,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_37 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_37 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -101,7 +101,7 @@ CLASS Z2UI5_CL_APP_DEMO_37 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
                           `<m:Button text="Load Custom Control"    press="` && client->_event( 'LOAD_CC' )    && `" />` && |\n|  &&
                           `<m:Button text="Display Custom Control" press="` && client->_event( 'DISPLAY_CC' ) && `" />` && |\n|  &&
                           `<html><head> ` &&
@@ -121,7 +121,7 @@ CLASS Z2UI5_CL_APP_DEMO_37 IMPLEMENTATION.
       `</html> ` && |\n|  &&
         `</mvc:View>`.
 
-
+    app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
 
   ENDMETHOD.
 
@@ -164,5 +164,6 @@ CLASS Z2UI5_CL_APP_DEMO_37 IMPLEMENTATION.
                             `    });` && |\n|  &&
                             `}); } </script>`.
 
+
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_38.clas.abap b/src/00/z2ui5_cl_app_demo_38.clas.abap
index bad98af3..a43d9eb4 100644
--- a/src/00/z2ui5_cl_app_demo_38.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_38.clas.abap
@@ -4,16 +4,6 @@ CLASS z2ui5_cl_app_demo_38 DEFINITION PUBLIC.
 
     INTERFACES z2ui5_if_app.
 
-    TYPES:
-      BEGIN OF ty_row,
-        title    TYPE string,
-        value    TYPE string,
-        descr    TYPE string,
-        icon     TYPE string,
-        info     TYPE string,
-        checkbox TYPE abap_bool,
-      END OF ty_row.
-
     TYPES:
       BEGIN OF ty_msg,
         type        TYPE string,
@@ -23,13 +13,12 @@ CLASS z2ui5_cl_app_demo_38 DEFINITION PUBLIC.
         group       TYPE string,
       END OF ty_msg.
 
-    DATA t_tab TYPE STANDARD TABLE OF ty_row WITH EMPTY KEY.
     DATA t_msg TYPE STANDARD TABLE OF ty_msg WITH EMPTY KEY.
     DATA check_initialized TYPE abap_bool.
 
   PROTECTED SECTION.
 
-      DATA client TYPE REF TO z2ui5_if_client.
+    DATA client TYPE REF TO z2ui5_if_client.
     DATA:
       BEGIN OF app,
         check_initialized TYPE abap_bool,
@@ -44,48 +33,37 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_38 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_38 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
 
-
     me->client     = client.
-    "we collect all app infos in the structure app
     app-get        = client->get( ).
-    app-view_popup = ``. "we display popups only once so clear it after every roundtrip
-
+    app-view_popup = ``.
 
     IF check_initialized = abap_false.
       check_initialized = abap_true.
 
-        t_msg = value #(
-            ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Error'     group = 'group 01' )
-            ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Information' group = 'group 01' )
-            ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Information' group = 'group 02' )
-            ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Success' group = 'group 03' )
-
-        ).
-
-      t_tab = VALUE #(
-        ( title = 'Peter'  info = 'completed'   descr = 'this is a description' icon = 'sap-icon://account' )
-        ( title = 'Peter'  info = 'incompleted' descr = 'this is a description' icon = 'sap-icon://account' )
-        ( title = 'Peter'  info = 'working'     descr = 'this is a description' icon = 'sap-icon://account' )
-        ( title = 'Peter'  info = 'working'     descr = 'this is a description' icon = 'sap-icon://account' )
-        ( title = 'Peter'  info = 'completed'   descr = 'this is a description' icon = 'sap-icon://account' )
-        ( title = 'Peter'  info = 'completed'   descr = 'this is a description' icon = 'sap-icon://account' )
-      ).
+      t_msg = VALUE #(
+          ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Error'     group = 'group 01' )
+          ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Information' group = 'group 01' )
+          ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Information' group = 'group 02' )
+          ( description = 'descr' subtitle = 'subtitle' title = 'title' type = 'Success' group = 'group 03' ) ).
 
     ENDIF.
 
     CASE client->get( )-event.
-      WHEN 'MESSAGES'.
-
+      WHEN 'POPUP'.
+        app-view_popup = 'POPUP'.
+      WHEN 'POPOVER'.
+        app-view_popup = 'POPOVER'.
+        app-next-popup_open_by_id = 'test'.
       WHEN 'BACK'.
         client->nav_app_leave( client->get_app( client->get( )-id_prev_app_stack ) ).
     ENDCASE.
 
-    DATA(page) = Z2UI5_CL_XML_VIEW=>factory( )->shell(
+    DATA(page) = z2ui5_cl_xml_view=>factory( )->shell(
         )->page(
             title          = 'abap2UI5 - List'
             navbuttonpress = client->_event( 'BACK' )
@@ -93,9 +71,9 @@ CLASS Z2UI5_CL_APP_DEMO_38 IMPLEMENTATION.
             )->header_content(
                 )->link(
                     text = 'Source_Code'  target = '_blank'
-                    href = Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) )
+                    href = z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) )
             )->get_parent( ).
-    page->button( text = 'Messages' press = client->_event( 'MESSAGES' ) ).
+    page->button( text = 'Messages' press = client->_event( 'POPUP' )  ).
     page->message_view(
         items = client->_bind( t_msg )
         groupitems = abap_true
@@ -104,28 +82,73 @@ CLASS Z2UI5_CL_APP_DEMO_38 IMPLEMENTATION.
             title       = `{TITLE}`
             subtitle    = `{SUBTITLE}`
             description = `{DESCRIPTION}`
-            groupname   = `{GROUP}`
-    ).
-    page->list(
-       headertext = 'List Ouput'
-       items      = client->_bind_one( t_tab )
-       )->standard_list_item(
-           title       = '{TITLE}'
-           description = '{DESCR}'
-           icon        = '{ICON}'
-           info        = '{INFO}' ).
+            groupname   = `{GROUP}` ).
+
+    page->footer( )->overflow_toolbar(
+         )->button(
+             id = 'test'
+             text  = 'Messages (6)'
+             press = client->_event( 'POPOVER' )
+             type  = 'Emphasized'
+         )->toolbar_spacer(
+         )->button(
+             text  = 'Send to Server'
+             press = client->_event( 'BUTTON_SEND' )
+             type  = 'Success' ).
 
     app-next-xml_main = page->get_root(  )->xml_get( ).
 
+    DATA(popup) = z2ui5_cl_xml_view=>factory_popup( ).
+    CASE app-view_popup.
 
-   " data(popup) = Z2UI5_CL_XML_VIEW=>factory_popup( )->
+      WHEN 'POPOVER'.
 
+        popup = popup->popover(
+            placement = `Top`
+            title = `Messages`
+            contentheight = '50%'
+            contentwidth = '50%' ).
+
+        popup->message_view(
+                items      = client->_bind( t_msg )
+                groupitems = abap_true
+            )->message_item(
+                type        = `{TYPE}`
+                title       = `{TITLE}`
+                subtitle    = `{SUBTITLE}`
+                description = `{DESCRIPTION}`
+                groupname   = `{GROUP}` ).
+
+      WHEN 'POPUP'.
+
+        popup = popup->dialog(
+        title = `Messages`
+        contentheight = '50%'
+        contentwidth = '50%' ).
+
+        popup->message_view(
+                items = client->_bind( t_msg )
+                groupitems = abap_true
+            )->message_item(
+                type        = `{TYPE}`
+                title       = `{TITLE}`
+                subtitle    = `{SUBTITLE}`
+                description = `{DESCRIPTION}`
+                groupname   = `{GROUP}` ).
+
+        popup->footer( )->overflow_toolbar(
+          )->toolbar_spacer(
+          )->button(
+              text  = 'close'
+              press = client->_event_close_popup( ) ).
+
+    ENDCASE.
+
+    app-next-xml_popup = popup->get_root(  )->xml_get( ).
 
-    "set the data for the frontend
     client->set_next( app-next ).
-
-    "the app will be serialized and persisted, we delete all data which is not needed in the future before
     CLEAR app-get.
     CLEAR app-next.
+
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_app_demo_39.clas.abap b/src/00/z2ui5_cl_app_demo_39.clas.abap
index 33577b99..eaa2a298 100644
--- a/src/00/z2ui5_cl_app_demo_39.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_39.clas.abap
@@ -156,6 +156,7 @@ CLASS z2ui5_cl_app_demo_39 IMPLEMENTATION.
                         `   </GenericTile>` && |\n|  &&
                         `</mvc:View>`.
 
+    app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
 
   ENDMETHOD.
 
diff --git a/src/00/z2ui5_cl_app_demo_40.clas.abap b/src/00/z2ui5_cl_app_demo_40.clas.abap
index 96a89956..cb7ea97d 100644
--- a/src/00/z2ui5_cl_app_demo_40.clas.abap
+++ b/src/00/z2ui5_cl_app_demo_40.clas.abap
@@ -27,7 +27,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_APP_DEMO_40 IMPLEMENTATION.
+CLASS z2ui5_cl_app_demo_40 IMPLEMENTATION.
 
 
   METHOD z2ui5_if_app~controller.
@@ -74,7 +74,7 @@ CLASS Z2UI5_CL_APP_DEMO_40 IMPLEMENTATION.
                           `  text="back" ` && |\n|  &&
                           `  press="` && client->_event( 'BACK' ) && `" ` && |\n|  &&
                           `  class="sapUiContentPadding sapUiResponsivePadding--content"/> ` && |\n|  &&
-                   `       <m:Link target="_blank" text="Source_Code" href="` && Z2UI5_CL_XML_VIEW=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
+                   `       <m:Link target="_blank" text="Source_Code" href="` && z2ui5_cl_xml_view=>hlp_get_source_code_url( app = me get = client->get( ) ) && `"/>` && |\n|  &&
 
                           `<html><head>` && |\n|  &&
                           `</head>` && |\n|  &&
@@ -99,5 +99,7 @@ CLASS Z2UI5_CL_APP_DEMO_40 IMPLEMENTATION.
            `</html> ` && |\n|  &&
              `</mvc:View>`.
 
+    app-next-xml_main = z2ui5_cl_xml_view=>hlp_replace_controller_name( app-next-xml_main ).
+
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_xml_view.clas.abap b/src/00/z2ui5_cl_xml_view.clas.abap
index 6a763cf8..c73a2645 100644
--- a/src/00/z2ui5_cl_xml_view.clas.abap
+++ b/src/00/z2ui5_cl_xml_view.clas.abap
@@ -40,6 +40,12 @@ CLASS z2ui5_cl_xml_view DEFINITION
       RETURNING
         VALUE(result) TYPE string.
 
+    CLASS-METHODS hlp_replace_controller_name
+      IMPORTING
+        xml           TYPE string
+      RETURNING
+        VALUE(result) TYPE string.
+
     METHODS constructor.
 
     METHODS horizontal_layout
@@ -96,6 +102,8 @@ CLASS z2ui5_cl_xml_view DEFINITION
         class         TYPE clike OPTIONAL
         placement     TYPE clike OPTIONAL
         initialFocus  TYPE clike OPTIONAL
+        contentwidth  TYPE clike OPTIONAL
+        contentheight TYPE clike OPTIONAL
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
@@ -513,29 +521,29 @@ CLASS z2ui5_cl_xml_view DEFINITION
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
-   METHODS message_view
+    METHODS message_view
       IMPORTING
-        items          TYPE clike OPTIONAL
-        groupItems     type clike optional
+        items         TYPE clike OPTIONAL
+        groupItems    TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
-   METHODS message_popover
+    METHODS message_popover
       IMPORTING
-        items          TYPE clike OPTIONAL
-        groupItems     type clike optional
+        items         TYPE clike OPTIONAL
+        groupItems    TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
-   METHODS message_item
+    METHODS message_item
       IMPORTING
-        type           TYPE clike OPTIONAL
-        title          TYPE clike OPTIONAL
-        subtitle       TYPE clike OPTIONAL
-        description    TYPE clike OPTIONAL
-        groupName      TYPE clike OPTIONAL
+        type          TYPE clike OPTIONAL
+        title         TYPE clike OPTIONAL
+        subtitle      TYPE clike OPTIONAL
+        description   TYPE clike OPTIONAL
+        groupName     TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS page
       IMPORTING
@@ -919,7 +927,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result->mt_prop = VALUE #( BASE result->mt_prop
         (  n = 'displayBlock'   v = 'true' )
         (  n = 'height'         v = '100%' )
-        (  n = 'controllerName' v = 'z2ui5_controller' )
+        (  n = 'controllerName' v = z2ui5_cl_http_handler=>config-controller_name )
     ).
 
     result->m_name   = `View`.
@@ -1759,10 +1767,12 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result = _generic(
           name   = `Popover`
           t_prop = VALUE #(
-                      ( n = `title`  v = title )
-                      ( n = `class`  v = class )
-                      ( n = `placement`  v = placement )
+                      ( n = `title`         v = title )
+                      ( n = `class`         v = class )
+                      ( n = `placement`     v = placement )
                       ( n = `initialFocus`  v = initialFocus )
+                      ( n = `contentHeight` v = contentheight )
+                      ( n = `contentWidth`  v = contentwidth )
         ) ).
 
   ENDMETHOD.
@@ -2379,4 +2389,11 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD hlp_replace_controller_name.
+
+    result  = _=>get_replace( iv_val = xml
+    iv_begin = 'controllerName="' iv_end = '"' iv_replace = `controllerName="` && z2ui5_cl_http_handler=>config-controller_name && `"` ).
+
+  ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/00/z2ui5_cl_xml_view.clas.locals_imp.abap b/src/00/z2ui5_cl_xml_view.clas.locals_imp.abap
index e0e6a787..c69e56cb 100644
--- a/src/00/z2ui5_cl_xml_view.clas.locals_imp.abap
+++ b/src/00/z2ui5_cl_xml_view.clas.locals_imp.abap
@@ -20,6 +20,15 @@ CLASS z2ui5_lcl_utility DEFINITION INHERITING FROM cx_no_check.
       RETURNING
         VALUE(result) TYPE string.
 
+  CLASS-METHODS get_replace
+      IMPORTING
+        iv_val        TYPE clike
+        iv_begin      TYPE clike
+        iv_end        TYPE clike
+        iv_replace    TYPE clike DEFAULT ''
+      RETURNING
+        VALUE(result) TYPE string.
+
   PROTECTED SECTION.
   PRIVATE SECTION.
 
@@ -27,6 +36,17 @@ ENDCLASS.
 
 CLASS z2ui5_lcl_utility IMPLEMENTATION.
 
+ METHOD get_replace.
+
+    result = iv_val.
+    SPLIT result AT iv_begin INTO DATA(lv_1) DATA(lv_2).
+    SPLIT lv_2 AT iv_end INTO DATA(lv_dummy) DATA(lv_4).
+    IF lv_4 IS NOT INITIAL.
+      result = lv_1 && iv_replace && lv_4.
+    ENDIF.
+
+  ENDMETHOD.
+
   METHOD get_classname_by_ref.
 
     DATA(lv_classname) = cl_abap_classdescr=>get_class_name( in ).
diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index 91c609a0..3a54fdb3 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -10,7 +10,12 @@ CLASS z2ui5_cl_http_handler DEFINITION
         body     TYPE string,
         t_header TYPE z2ui5_if_client=>ty_t_name_value,
         t_param  TYPE z2ui5_if_client=>ty_t_name_value,
-      END OF client.
+      END OF client .
+
+    CLASS-DATA:
+      BEGIN OF config READ-ONLY,
+        controller_name TYPE string VALUE `z2ui5_controller`,
+      END OF config.
 
     CLASS-METHODS main_index_html
       IMPORTING
@@ -290,5 +295,4 @@ CLASS z2ui5_cl_http_handler IMPLEMENTATION.
                            `</html>`.
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index 5e63d699..5e50e6ad 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -37,15 +37,6 @@ CLASS z2ui5_lcl_utility DEFINITION INHERITING FROM cx_no_check.
         when TYPE abap_bool DEFAULT abap_true
           PREFERRED PARAMETER v.
 
-    CLASS-METHODS get_replace
-      IMPORTING
-        iv_val        TYPE clike
-        iv_begin      TYPE clike
-        iv_end        TYPE clike
-        iv_replace    TYPE clike DEFAULT ''
-      RETURNING
-        VALUE(result) TYPE string.
-
     CLASS-METHODS get_header_val
       IMPORTING
         v             TYPE clike
@@ -239,18 +230,6 @@ CLASS z2ui5_lcl_utility IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD get_replace.
-
-    result = iv_val.
-    SPLIT result AT iv_begin INTO DATA(lv_1) DATA(lv_2).
-    SPLIT lv_2 AT iv_end INTO DATA(lv_dummy) DATA(lv_4).
-    IF lv_4 IS NOT INITIAL.
-      result = lv_1 && iv_replace && lv_4.
-    ENDIF.
-
-  ENDMETHOD.
-
   METHOD get_params_by_url.
 
     DATA(url_segments) = segment( val = get_trim_upper( url ) index = 2 sep = `?` ).
@@ -992,10 +971,6 @@ CLASS z2ui5_lcl_system_runtime DEFINITION.
       RETURNING
         VALUE(r_view_model) TYPE REF TO z2ui5_lcl_utility_tree_json.
 
-    METHODS request_end_view
-      RETURNING
-        VALUE(rv_xml) TYPE string.
-
   PROTECTED SECTION.
   PRIVATE SECTION.
 ENDCLASS.
@@ -1420,7 +1395,7 @@ CLASS z2ui5_lcl_system_runtime IMPLEMENTATION.
     ENDIF.
 
     IF ms_next-s_set-xml_main IS NOT INITIAL AND ms_next-s_set-check_set_prev_view = abap_false.
-      lo_ui5_model->add_attribute( n = `vView` v = request_end_view( ) ).
+      lo_ui5_model->add_attribute( n = `vView` v = ms_next-s_set-xml_main ).
     ENDIF.
 
     IF ms_next-s_set-xml_popup IS NOT INITIAL.
@@ -1793,15 +1768,6 @@ CLASS z2ui5_lcl_system_runtime IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD request_end_view.
-
-    rv_xml  = _=>get_replace( iv_val = ms_next-s_set-xml_main
-    iv_begin = 'controllerName="' iv_end = '"' iv_replace = 'controllerName="z2ui5_controller"' ).
-
-  ENDMETHOD.
-
-
 ENDCLASS.
 
 CLASS z2ui5_lcl_if_client IMPLEMENTATION.