diff --git a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
index 32a0147ab..b56cefc36 100644
--- a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
+++ b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
@@ -2,50 +2,50 @@
 {# @license     http://opensource.org/licenses/AGPL-3.0 #}
 {% apply spaceless %}
 
-{% UIContentBlock Standard {'aContainerClasses': ['ibo-update-core', 'display_block', 'display-files']} %}
+{% UIContentBlock Standard {'aContainerClasses': ['ibo-update-core', 'ibo-setup--wizard']} %}
 
     {% if bSuccess %}
+        {% UIContentBlock Standard {'aContainerClasses': ['ibo-setup--wizard--content']} %}
+            {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s, 'sId':'update_progress'} %}
+                {% UIAlert ForSuccess {'sContent':sQuestion, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
+                {% set sVersion = 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) %}
+                {% UIField Large {'sLabel':'iTopUpdate:UI:CurrentVersion'|dict_s, 'sValueHtml':sVersion} %}{% EndUIField %}
+            {% EndUIFieldSet %}
 
-        {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s, 'sId':'update_progress'} %}
-        {% UIAlert ForSuccess {'sContent':sQuestion, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
-        {% set sVersion = 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) %}
-        {% UIField Large {'sLabel':'iTopUpdate:UI:CurrentVersion'|dict_s, 'sValueHtml':sVersion} %}{% EndUIField %}
-        {% EndUIFieldSet %}
+            {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Backup'|dict_s} %}
 
-        {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Backup'|dict_s} %}
+                {% if bDoBackup or bDoFilesArchive %}
+                    {% if bDoBackup %}
+                        {% UIField Large {'sLabel':'iTopUpdate:UI:WithDBBackup'|dict_s, 'sValueHtml':sBackupFile} %}{% EndUIField %}
+                    {% endif %}
+                    {% if bDoFilesArchive %}
+                        {% UIField Large {'sLabel':'iTopUpdate:UI:WithFilesBackup'|dict_s, 'sValueHtml':sItopArchive} %}{% EndUIField %}
+                    {% endif %}
+                {% else %}
+                    {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WithoutBackup'|dict_s, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
+                {% endif %}
 
-        {% if bDoBackup or bDoFilesArchive %}
-            {% if bDoBackup %}
-                {% UIField Large {'sLabel':'iTopUpdate:UI:WithDBBackup'|dict_s, 'sValueHtml':sBackupFile} %}{% EndUIField %}
-            {% endif %}
-            {% if bDoFilesArchive %}
-                {% UIField Large {'sLabel':'iTopUpdate:UI:WithFilesBackup'|dict_s, 'sValueHtml':sItopArchive} %}{% EndUIField %}
-            {% endif %}
-        {% else %}
-            {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WithoutBackup'|dict_s, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
-        {% endif %}
+            {% EndUIFieldSet %}
 
-        {% EndUIFieldSet %}
+            {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Action'|dict_s} %}
+                {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WarningReadOnlyDuringUpdate'|dict_s, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
+            {% EndUIFieldSet %}
+        {% EndUIContentBlock %}
 
-        {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Action'|dict_s} %}
-            {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WarningReadOnlyDuringUpdate'|dict_s, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
-
-            {% UIToolbar ForButton {} %}
-                {% UIForm Standard {'CSSClasses':['form-inline']} %}
-                    {% UIButton ForCancel {'sId':'cancel-update', 'sLabel':'iTopUpdate:UI:Cancel'|dict_s, 'bIsSubmit':true} %}
-                {% EndUIForm %}
-                {% UIToolbarSpacer Standard {} %}
-                {% UIForm Standard {'CSSClasses':['form-inline']} %}
-                    {% UIButton ForPrimaryAction {'sId':'do-update', 'sLabel':'iTopUpdate:UI:DoUpdate'|dict_s, 'bIsSubmit':true} %}
-                    {% UIInput ForHidden {'sName':'operation', 'sValue':'UpdateCoreFiles'} %}
-                    {% UIInput ForHidden {'sName':'transaction_id', 'sValue':sTransactionId} %}
-                    {% UIInput ForHidden {'sName':'filename', 'sValue':sName} %}
-                    {% UIInput ForHidden {'sName':'doBackup', 'sValue':bDoBackup} %}
-                    {% UIInput ForHidden {'sName':'doFilesArchive', 'sValue':bDoFilesArchive} %}
-                {% EndUIForm %}
-            {% EndUIToolbar %}
-
-        {% EndUIFieldSet %}
+        {% UIToolbar ForButton {'AddCSSClass':'ibo-setup--wizard--buttons-container'} %}
+            {% UIForm Standard {'CSSClasses':['form-inline']} %}
+                {% UIButton ForCancel {'sId':'cancel-update', 'sLabel':'iTopUpdate:UI:Cancel'|dict_s, 'bIsSubmit':true} %}
+            {% EndUIForm %}
+            {% UIToolbarSpacer Standard {} %}
+            {% UIForm Standard {'CSSClasses':['form-inline']} %}
+                {% UIButton ForPrimaryAction {'sId':'do-update', 'sLabel':'iTopUpdate:UI:DoUpdate'|dict_s, 'bIsSubmit':true} %}
+                {% UIInput ForHidden {'sName':'operation', 'sValue':'UpdateCoreFiles'} %}
+                {% UIInput ForHidden {'sName':'transaction_id', 'sValue':sTransactionId} %}
+                {% UIInput ForHidden {'sName':'filename', 'sValue':sName} %}
+                {% UIInput ForHidden {'sName':'doBackup', 'sValue':bDoBackup} %}
+                {% UIInput ForHidden {'sName':'doFilesArchive', 'sValue':bDoFilesArchive} %}
+            {% EndUIForm %}
+        {% EndUIToolbar %}
 
     {% else %}
 
diff --git a/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig b/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig
index c295a2b96..aa831ed84 100644
--- a/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig
+++ b/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig
@@ -3,53 +3,55 @@
 
 {% apply spaceless %}
 
-    {% UIContentBlock Standard {aContainerClasses: ['ibo-update-core', 'display_block', 'display-files']} %}
+    {% UIContentBlock Standard {aContainerClasses: ['ibo-update-core', 'ibo-setup--wizard']} %}
 
-        {% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Progress'|dict_s, sId:'installation_progress'} %}
-            {#  Todo 3.0 Add Progress bar UIBlock  #}
-            <div id="progress_content">
-                <p class="center">
-                    <span id="setup_msg">{{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }}</span>
-                </p>
-                <div id="progress">0%</div>
-            </div>
-        {% EndUIFieldSet %}
+        {% UIContentBlock Standard {'aContainerClasses': ['ibo-setup--wizard--content']} %}
+            {% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Progress'|dict_s, sId:'installation_progress'} %}
+                {#  Todo 3.0 Add Progress bar UIBlock  #}
+                <div id="progress_content">
+                    <p class="center">
+                        <span id="setup_msg">{{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }}</span>
+                    </p>
+                    <div id="progress">0%</div>
+                </div>
+            {% EndUIFieldSet %}
 
-        {% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Status'|dict_s} %}
-            {% UIAlert ForSuccess {sId:'new_version', sTitle:'iTopUpdate:UI:NewVersion'|dict_s, IsHidden:true, IsCollapsible:false, IsClosable:false} %}
-                {% UIContentBlock Standard {aContainerClasses:['ibo-update-core--current-version']} %}
-                    {{ sCurrentVersion }}
-                {% EndUIContentBlock %}
-            {% EndUIAlert %}
-            {% UIAlert ForInformation {sId:'current_version', IsCollapsible:false, IsClosable:false} %}
-                {% UIContentBlock Standard {aContainerClasses:['ibo-update-core--current-version']} %}
-                    {{ sCurrentVersion }}
-                {% EndUIContentBlock %}
-            {% EndUIAlert %}
+            {% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Status'|dict_s} %}
+                {% UIAlert ForSuccess {sId:'new_version', sTitle:'iTopUpdate:UI:NewVersion'|dict_s, IsHidden:true, IsCollapsible:false, IsClosable:false} %}
+                    {% UIContentBlock Standard {aContainerClasses:['ibo-update-core--current-version']} %}
+                        {{ sCurrentVersion }}
+                    {% EndUIContentBlock %}
+                {% EndUIAlert %}
+                {% UIAlert ForInformation {sId:'current_version', IsCollapsible:false, IsClosable:false} %}
+                    {% UIContentBlock Standard {aContainerClasses:['ibo-update-core--current-version']} %}
+                        {{ sCurrentVersion }}
+                    {% EndUIContentBlock %}
+                {% EndUIAlert %}
 
-            {% if bDoBackup %}
-                {% UIAlert ForInformation {sId:'do_backup_done', sTitle:'iTopUpdate:UI:WithDBBackup'|dict_s, sContent:sBackupFile, IsHidden:true} %}{% EndUIAlert %}
-            {% endif %}
-
-            {% if bDoFilesArchive %}
-                {% UIAlert ForInformation {sId:'do_files_archive_done', sTitle:'iTopUpdate:UI:WithFilesBackup'|dict_s, sContent:sItopArchive, IsHidden:true} %}{% EndUIAlert %}
-            {% endif %}
-        {% EndUIFieldSet %}
-
-        {% UIFieldSet Standard {sLegend:''} %}
-
-            {% UIAlert ForFailure {sId:'setup_error_outer', sContent:'', IsCollapsible:false, IsClosable:false, IsHidden:true} %}
-                {% UIContentBlock Standard {sId:'setup_error',aContainerClasses:['ibo-update-core--error']} %}{% EndUIContentBlock %}
-                {% if bDoFilesArchive %}
-                    {{ 'iTopUpdate:UI:RestoreArchive'|dict_format(sItopArchive) }}
-                {% endif %}
                 {% if bDoBackup %}
-                    {{ 'iTopUpdate:UI:RestoreBackup'|dict_format(sBackupFile) }}
+                    {% UIAlert ForInformation {sId:'do_backup_done', sTitle:'iTopUpdate:UI:WithDBBackup'|dict_s, sContent:sBackupFile, IsHidden:true} %}{% EndUIAlert %}
                 {% endif %}
-                    {{ 'iTopUpdate:UI:MaintenanceModeActive'|dict_s }}
-            {% EndUIAlert %}
 
-            {% UIContentBlock Standard {aContainerClasses:["ibo-setup--button-bar"]} %}
+                {% if bDoFilesArchive %}
+                    {% UIAlert ForInformation {sId:'do_files_archive_done', sTitle:'iTopUpdate:UI:WithFilesBackup'|dict_s, sContent:sItopArchive, IsHidden:true} %}{% EndUIAlert %}
+                {% endif %}
+            {% EndUIFieldSet %}
+
+            {% UIFieldSet Standard {sLegend:''} %}
+                {% UIAlert ForFailure {sId:'setup_error_outer', sContent:'', IsCollapsible:false, IsClosable:false, IsHidden:true} %}
+                    {% UIContentBlock Standard {sId:'setup_error',aContainerClasses:['ibo-update-core--error']} %}{% EndUIContentBlock %}
+                    {% if bDoFilesArchive %}
+                        {{ 'iTopUpdate:UI:RestoreArchive'|dict_format(sItopArchive) }}
+                    {% endif %}
+                    {% if bDoBackup %}
+                        {{ 'iTopUpdate:UI:RestoreBackup'|dict_format(sBackupFile) }}
+                    {% endif %}
+                        {{ 'iTopUpdate:UI:MaintenanceModeActive'|dict_s }}
+                {% EndUIAlert %}
+            {% EndUIFieldSet %}
+        {% EndUIContentBlock %}
+
+        {% UIToolbar ForButton {'AddCSSClass':'ibo-setup--wizard--buttons-container'} %}
                 {% UIContentBlock Standard {sId:'run_setup',aContainerClasses:['ibo-update-core--run-setup'], IsHidden:true} %}
                     {% UIForm Standard {CSSClasses:['form-inline']} %}
                         {% UIInput ForHidden {sName:'operation', sValue:'RunSetup'} %}
@@ -62,9 +64,7 @@
                 {% UIForm Standard {CSSClasses:['form-inline']} %}
                     {% UIButton ForPrimaryAction {sLabel:'iTopUpdate:UI:Continue'|dict_s, sId:'setup_continue', bIsSubmit:true, IsDisabled:true} %}
                 {% EndUIForm %}
-            {% EndUIContentBlock %}
-
-        {% EndUIFieldSet %}
+        {% EndUIToolbar %}
 
     {% EndUIContentBlock %}
 {% endapply %}
\ No newline at end of file