diff --git a/src/ui/zcl_abapgit_gui_page_addofflin.clas.abap b/src/ui/zcl_abapgit_gui_page_addofflin.clas.abap
index 800727773..b185b7cc9 100644
--- a/src/ui/zcl_abapgit_gui_page_addofflin.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_addofflin.clas.abap
@@ -58,7 +58,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_addofflin IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_ADDOFFLIN IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -223,9 +223,11 @@ CLASS zcl_abapgit_gui_page_addofflin IMPLEMENTATION.
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
 
+    ri_html->add( '<div class="form-container">' ).
     ri_html->add( mo_form->render(
       io_values         = mo_form_data
       io_validation_log = mo_validation_log ) ).
+    ri_html->add( '</div>' ).
 
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_page_addonline.clas.abap b/src/ui/zcl_abapgit_gui_page_addonline.clas.abap
index 083001503..2913f7c8d 100644
--- a/src/ui/zcl_abapgit_gui_page_addonline.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_addonline.clas.abap
@@ -62,7 +62,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_addonline IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_ADDONLINE IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -281,9 +281,10 @@ CLASS zcl_abapgit_gui_page_addonline IMPLEMENTATION.
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
 
+    ri_html->add( '<div class="form-container">' ).
     ri_html->add( mo_form->render(
       io_values         = mo_form_data
       io_validation_log = mo_validation_log ) ).
-
+    ri_html->add( '</div>' ).
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_page_commit.clas.abap b/src/ui/zcl_abapgit_gui_page_commit.clas.abap
index 217352895..99556499a 100644
--- a/src/ui/zcl_abapgit_gui_page_commit.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_commit.clas.abap
@@ -114,7 +114,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION.
 
 
   METHOD branch_name_to_internal.
@@ -527,6 +527,7 @@ CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
 
+    ri_html->add( '<div class="repo">' ).
     ri_html->add( '<div id="top" class="paddings">' ).
     ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top( mo_repo ) ).
     ri_html->add( '</div>' ).
@@ -543,6 +544,7 @@ CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION.
     ri_html->add( '<div id="stage-details" class="dialog w800px">' ).
     ri_html->add( render_stage_details( ) ).
     ri_html->add( '</div>' ).
+    ri_html->add( '</div>' ).
 
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_page_ex_object.clas.abap b/src/ui/zcl_abapgit_gui_page_ex_object.clas.abap
index 10fa8f172..2a8455cea 100644
--- a/src/ui/zcl_abapgit_gui_page_ex_object.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_ex_object.clas.abap
@@ -49,7 +49,9 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_EX_OBJECT IMPLEMENTATION.
+
+
   METHOD constructor.
     super->constructor( ).
     CREATE OBJECT mo_validation_log.
@@ -58,6 +60,7 @@ CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
     mo_form_util = zcl_abapgit_html_form_utils=>create( mo_form ).
   ENDMETHOD.
 
+
   METHOD create.
     DATA lo_component TYPE REF TO zcl_abapgit_gui_page_ex_object.
     CREATE OBJECT lo_component.
@@ -67,6 +70,20 @@ CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
       ii_child_component = lo_component ).
   ENDMETHOD.
 
+
+  METHOD export_object.
+    DATA lv_object_type TYPE trobjtype.
+    DATA lv_object_name TYPE sobj_name.
+
+    lv_object_type = mo_form_data->get( c_id-object_type ).
+    lv_object_name = mo_form_data->get( c_id-object_name ).
+
+    zcl_abapgit_zip=>export_object(
+      iv_object_type = lv_object_type
+      iv_object_name = lv_object_name ).
+  ENDMETHOD.
+
+
   METHOD get_form_schema.
     ro_form = zcl_abapgit_html_form=>create( iv_form_id = 'export-object-to-files' ).
 
@@ -90,6 +107,7 @@ CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
       iv_action      = c_event-go_back ).
   ENDMETHOD.
 
+
   METHOD zif_abapgit_gui_event_handler~on_event.
     mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ).
 
@@ -119,26 +137,15 @@ CLASS zcl_abapgit_gui_page_ex_object IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD export_object.
-    DATA lv_object_type TYPE trobjtype.
-    DATA lv_object_name TYPE sobj_name.
-
-    lv_object_type = mo_form_data->get( c_id-object_type ).
-    lv_object_name = mo_form_data->get( c_id-object_name ).
-
-    zcl_abapgit_zip=>export_object(
-      iv_object_type = lv_object_type
-      iv_object_name = lv_object_name ).
-  ENDMETHOD.
-
   METHOD zif_abapgit_gui_renderable~render.
     gui_services( )->register_event_handler( me ).
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
 
+    ri_html->add( '<div class="form-container">' ).
     ri_html->add( mo_form->render(
       io_values         = mo_form_data
       io_validation_log = mo_validation_log ) ).
+    ri_html->add( '</div>' ).
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap b/src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap
index 96b0543cb..2201b7881 100644
--- a/src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap
@@ -77,7 +77,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_sett_glob IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_GLOB IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -366,10 +366,11 @@ CLASS zcl_abapgit_gui_page_sett_glob IMPLEMENTATION.
     ENDIF.
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
-
+    ri_html->add( '<div class="form-container">' ).
     ri_html->add( mo_form->render(
       io_values         = mo_form_data
       io_validation_log = mo_validation_log ) ).
+    ri_html->add( '</div>' ).
 
   ENDMETHOD.
 ENDCLASS.
diff --git a/src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap b/src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap
index ca0284db8..e03e8377b 100644
--- a/src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap
@@ -318,10 +318,10 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_PERS IMPLEMENTATION.
     ENDIF.
 
     CREATE OBJECT ri_html TYPE zcl_abapgit_html.
-
+    ri_html->add( '<div class="form-container">' ).
     ri_html->add( mo_form->render(
       io_values         = mo_form_data
       io_validation_log = mo_validation_log ) ).
-
+    ri_html->add( '</div>' ).
   ENDMETHOD.
 ENDCLASS.