diff --git a/metadata.php b/metadata.php
index 7f6c6bd..6d9d1a9 100755
--- a/metadata.php
+++ b/metadata.php
@@ -88,25 +88,25 @@ $aModule = [
     ],
     'templates' => [
         // Event files that store the GA4 Event-Information
-        '@' . Constants::OXID_MODULE_ID . '/event/add_to_cart.tpl' => 'views/smarty/event/add_to_cart.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_item.tpl' => 'views/smarty/event/view_item.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_cart.tpl' => 'views/smarty/event/view_cart.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/begin_checkout.tpl' => 'views/smarty/event/begin_checkout.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/add_to_cart.tpl'      => 'views/smarty/event/add_to_cart.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/view_item.tpl'        => 'views/smarty/event/view_item.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/view_cart.tpl'        => 'views/smarty/event/view_cart.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/begin_checkout.tpl'   => 'views/smarty/event/begin_checkout.tpl',
         '@' . Constants::OXID_MODULE_ID . '/event/add_payment_info.tpl' => 'views/smarty/event/add_payment_info.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/purchase.tpl' => 'views/smarty/event/purchase.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_item_list.tpl' => 'views/smarty/event/view_item_list.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/purchase.tpl'         => 'views/smarty/event/purchase.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/event/view_item_list.tpl'   => 'views/smarty/event/view_item_list.tpl',
         '@' . Constants::OXID_MODULE_ID . '/event/view_search_result.tpl' => 'views/smarty/event/view_search_result.tpl',
         '@' . Constants::OXID_MODULE_ID . '/event/remove_from_cart.tpl' => 'views/smarty/event/remove_from_cart.tpl',
 
         // complete overwritten file of OXID-Originals
         // the path of the template-name is the original path to the file in OXID-context from tpl/->
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmnoticelist.tpl' => 'views/smarty/page/account/d3gtmnoticelist.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmrecommendationlist.tpl' => 'views/smarty/page/account/d3gtmrecommendationlist.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmwishlist.tpl' => 'views/smarty/page/account/d3gtmwishlist.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/d3gtmnoticelist.tpl'            => 'views/smarty/d3gtmnoticelist.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/d3gtmrecommendationlist.tpl'    => 'views/smarty/d3gtmrecommendationlist.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/d3gtmwishlist.tpl'              => 'views/smarty/d3gtmwishlist.tpl',
 
         // Admin Templates
-        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uimain.tpl' => 'views/smarty/admin/d3googleanalytics4_main.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uiheaditem.tpl' => 'views/smarty/admin/d3googleanalytics4_headitem.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uimain.tpl'          => 'views/smarty/admin/d3googleanalytics4_main.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uiheaditem.tpl'      => 'views/smarty/admin/d3googleanalytics4_headitem.tpl',
     ],
     'blocks' => [
         // tag manager js
@@ -192,9 +192,6 @@ $aModule = [
             'file' => 'views/smarty/blocks/begin_checkout.tpl',
             'position' => 150,
         ],
-        // Add payment info
-        // We add it into checkout_order_main ( checkout/order.tpl ) to make sure a payment is actually added;
-        // we'll also do it like that in the future for add_shipping_info ( not planed yet )
         [
             'template' => 'page/checkout/order.tpl',
             'block' => 'checkout_order_main',
diff --git a/views/smarty/page/account/d3gtmnoticelist.tpl b/views/smarty/d3gtmnoticelist.tpl
similarity index 100%
rename from views/smarty/page/account/d3gtmnoticelist.tpl
rename to views/smarty/d3gtmnoticelist.tpl
diff --git a/views/smarty/page/account/d3gtmrecommendationlist.tpl b/views/smarty/d3gtmrecommendationlist.tpl
similarity index 100%
rename from views/smarty/page/account/d3gtmrecommendationlist.tpl
rename to views/smarty/d3gtmrecommendationlist.tpl
diff --git a/views/smarty/page/account/d3gtmwishlist.tpl b/views/smarty/d3gtmwishlist.tpl
similarity index 100%
rename from views/smarty/page/account/d3gtmwishlist.tpl
rename to views/smarty/d3gtmwishlist.tpl
diff --git a/views/twig/admin/d3ga4uiheaditem.html.twig b/views/twig/admin/d3ga4uiheaditem.html.twig
new file mode 100644
index 0000000..0db41ab
--- /dev/null
+++ b/views/twig/admin/d3ga4uiheaditem.html.twig
@@ -0,0 +1 @@
+head!
\ No newline at end of file
diff --git a/views/twig/admin/d3ga4uimain.html.twig b/views/twig/admin/d3ga4uimain.html.twig
new file mode 100644
index 0000000..0299233
--- /dev/null
+++ b/views/twig/admin/d3ga4uimain.html.twig
@@ -0,0 +1 @@
+main!
\ No newline at end of file
diff --git a/views/twig/admin/d3googleanalytics4_headitem.html.twig b/views/twig/admin/d3googleanalytics4_headitem.html.twig
deleted file mode 100644
index f2b4633..0000000
--- a/views/twig/admin/d3googleanalytics4_headitem.html.twig
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-    <title>{{ title }}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ charset }}">
-    {% if isset(meta_refresh_sec, meta_refresh_url) %}
-<meta http-equiv=Refresh content="{{ meta_refresh_sec }};URL={{ meta_refresh_url|replace("&amp;", "&") }}">
-    {% endif %}
-    <link rel="shortcut icon" href="{{ oViewConf.getBaseDir() }}favicon.ico">
-
-    {% block admin_headitem_inccss %}
-<link rel="stylesheet" href="{{ oViewConf.getResourceUrl() }}main.css">
-<link rel="stylesheet" href="{{ oViewConf.getResourceUrl() }}colors_{{ oViewConf.getEdition()|lower }}.css">
-<link rel="stylesheet" type="text/css" href="{{ oViewConf.getResourceUrl() }}yui/build/assets/skins/sam/container.css">
-    {% endblock %}
-
-    {% block admin_headitem_incjs %}
-    <script type="text/javascript" src="{{ oViewConf.getResourceUrl() }}yui/build/utilities/utilities.js"></script>
-    <script type="text/javascript" src="{{ oViewConf.getResourceUrl() }}yui/build/container/container-min.js"></script>
-    <script type="text/javascript" src="{{ oViewConf.getResourceUrl() }}yui/oxid-help.js"></script>
-    {% endblock %}
-
-    {% block admin_headitem_js %}
-    <script type="text/javascript">
-        <!--
-        // standard messages
-        var sUnassignMessage = "{{ translate({ ident: 'GENERAL_YOUWANTTOUNASSIGN' }) }}";
-        var sDeleteMessage   = "{{ translate({ ident: 'GENERAL_YOUWANTTODELETE' }) }}";
-
-        // class info
-        var sDefClass = '{{ default_edit }}';
-        var sActClass = '{{ actlocation }}';
-
-        {% if updatelist == 1 %}
-        window.onload = function ()
-        {
-            top.oxid.admin.updateList('{{ oxid }}');
-        }
-            {% endif %}
-
-
-        var ajaxpopup = null;
-        function showDialog( sParams )
-        {
-            ajaxpopup = window.open('{{ oViewConf.getSelfLink()|replace("&amp;", "&") }}'+sParams, 'ajaxpopup', 'width=850,height=680,scrollbars=yes,resizable=yes');
-        }
-
-        function focusPopup()
-        {
-            if ( ajaxpopup )ajaxpopup.focus();
-        }
-
-        window.onclick = focusPopup;
-
-        function cleanupLongDesc( sValue )
-        {
-            if ( sValue == '<br>' || sValue == '<br />' ) {
-                return '';
-            }
-            return sValue;
-        }
-
-        function copyLongDesc( sIdent )
-        {
-            var textVal = null;
-            try {
-                if ( WPro.editors[sIdent] != null ) {
-                    WPro.editors[sIdent].prepareSubmission();
-                    textVal = cleanupLongDesc( WPro.editors[sIdent].getValue() );
-                }
-            } catch(err) {
-                var varEl = document.getElementById(sIdent);
-                if (varEl != null) {
-                    textVal = cleanupLongDesc( varEl.value );
-                }
-            }
-
-            if (textVal == null) {
-                var varName = 'editor_'+sIdent;
-                var varEl = document.getElementById(varName);
-                if (varEl != null) {
-                    textVal = cleanupLongDesc( varEl.value );
-                }
-            }
-
-            if (textVal != null) {
-                var oTarget = document.getElementsByName( 'editval['+ sIdent + ']' );
-                if ( oTarget != null && ( oField = oTarget.item( 0 ) ) != null ) {
-                    oField.value = textVal;
-                }
-            }
-        }
-        -->
-    </script>
-    {% endblock %}
-
-</head>
-<body>
-{% include "tooltips.html.twig" %}
-<div id="oxajax_data"></div>
-
-<div class="{{ box|default('box') }}" style="height: 100%;">
-    {% include "inc_error.html.twig" with {Errorlist: Errors.default} %}
-
-    <!-- Input help popup -->
-    <div id="helpTextContainer" class="yui-skin-sam">
-        <div id="helpPanel"></div>
-    </div>
\ No newline at end of file
diff --git a/views/twig/admin/d3googleanalytics4_main.html.twig b/views/twig/admin/d3googleanalytics4_main.html.twig
deleted file mode 100644
index aa066a8..0000000
--- a/views/twig/admin/d3googleanalytics4_main.html.twig
+++ /dev/null
@@ -1,197 +0,0 @@
-{% include "@d3googleanalytics4/admin/d3ga4uiheaditem.html.twig" with {title: "GENERAL_ADMIN_TITLE"|translate} %}
-<style>
-    body {
-        background-image: linear-gradient(to top, #d5d4d0 0%, #d5d4d0 1%, #eeeeec 31%, #efeeec 75%, #e9e9e7 100%);
-    }
-</style>
-
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-
-{% if readonly %}
-    {% set readonly = "readonly disabled" %}
-    {% else %}
-    {% set readonly = "" %}
-    {% endif %}
-
-<div>
-    <form name="d3gtmformedit" id="d3gtmformedit" action="{{ oViewConf.getSelfLink() }}" enctype="multipart/form-data" method="post">
-        <div class="row">
-            <div class="col-6">
-                {{ oViewConf.getHiddenSid() }}
-                <input type="hidden" name="cl" value="{{ oViewConf.getActiveClassName() }}">
-                <input type="hidden" name="fnc" value="">
-                <input type="hidden" name="editlanguage" value="{{ editlanguage }}">
-
-                <div class="card mb-5">
-                    <div class="card-header">
-                        {{ translate({ ident: "D3BASECONFIG" }) }}
-                    </div>
-                    <div class="card-body">
-                        <div class="form-check mb-3">
-                            <input class="form-check-input" type="checkbox" value="" name="editval[bool][_blEnableGa4]" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableGa4') %}checked{% endif %} id="blGA4enab">
-                            <label class="form-check-label" for="flexCheckDefault">
-                                {{ translate({ ident: "D3ACTIVATEMOD" }) }} {% if false is same as(d3ViewObject.d3GetModuleConfigParam('_blEnableGa4')) %}<span style="color: red">{{ translate({ ident: "D3INACTIVATEMOD" }) }}</span>{% endif %}
-                            </label>
-                        </div>
-                        <div class="mb-3">
-                            <div class="input-group w-50">
-                                <span class="input-group-text" id="basic-addon3">{{ translate({ ident: "D3CONTAINERID" }) }}</span>
-                                <input type="text" class="form-control" id="_sContainerID" name="editval[str][_sContainerID]" aria-describedby="basic-addon3" value="{{ d3ViewObject.d3GetModuleConfigParam('_sContainerID') }}">
-                            </div>
-                            <div class="text-muted">{{ translate({ ident: "D3CONTAINERID_HELP" }) }}</div>
-                        </div>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" value="" id="_blEnableDebug" name="editval[bool][_blEnableDebug]" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableDebug') %}checked{% endif %}>
-                            <label class="form-check-label" for="flexCheckDefault">
-                                {{ translate({ ident: "D3USEDEBUGMODE" }) }}{% include "inputhelp.html.twig" with {'sHelpId': help_id("D3USEDEBUGMODE_HELP"), 'sHelpText': help_text("D3USEDEBUGMODE_HELP")} %}
-                            </label>
-                        </div>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" value="" id="_blActivateConsentMode" name="editval[bool][_blEnableConsentMode]" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableConsentMode') %}checked{% endif %}>
-                            <label class="form-check-label" for="flexCheckChecked">
-                                {{ translate({ ident: "D3USEGOOGLECONSENTMODE" }) }}{% include "inputhelp.html.twig" with {'sHelpId': help_id("D3USEGOOGLECONSENTMODE_HELP"), 'sHelpText': help_text("D3USEGOOGLECONSENTMODE_HELP")} %}
-                            </label>
-                        </div>
-                    </div>
-                    <button type="submit" name="save" class="btn btn-light" onClick="Javascript:document.d3gtmformedit.fnc.value='save'">{{ translate({ ident: "GENERAL_SAVE" }) }}</button>
-                </div>
-            </div>
-            <div class="col-6">
-                <div class="card border border-0">
-                    <div class="accordion" id="accordionPanelsStayOpenExample">
-                        <div class="accordion-item">
-                            <h2 class="accordion-header">
-                                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-cmpsettings" aria-expanded="true" aria-controls="panelsStayOpen-cmpsettings">
-                                    {{ translate({ ident: "D3CMPTABTITLE" }) }}
-                                </button>
-                            </h2>
-                            <div id="panelsStayOpen-cmpsettings" class="accordion-collapse collapse show">
-                                <div class="accordion-body">
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="editval[bool][_blEnableOwnCookieManager]" value="" id="_hasOwnCookieManager" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableOwnCookieManager') %}checked{% endif %}>
-                                        <label class="form-check-label" for="flexCheckChecked">
-                                            {{ translate({ ident: "D3CMPUSEQ" }) }}{% include "inputhelp.html.twig" with {'sHelpId': help_id("D3CMPUSEQ_HELP"), 'sHelpText': help_text("D3CMPUSEQ_HELP")} %}
-                                        </label>
-                                    </div>
-                                    <div class="mb-3">
-                                        <label>
-                                            {{ translate({ ident: "D3CMP" }) }}
-                                        </label>
-                                        <select class="form-select w-50" name="editval[select][_HAS_STD_MANAGER]" aria-label="Default select example">
-                                            {% for sInternalName, sPublicName in d3ManagerTypeArray %}
-                                            <option value="{{ sInternalName }}" {% if sInternalName is same as(d3CurrentCMP) %}SELECTED{% endif %}>{{ sPublicName }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                    <div>
-                                        <div class="input-group w-75">
-                                            <span class="input-group-text" id="basic-addon3">{{ translate({ ident: "D3CNTRLPARAM" }) }}</span>
-                                            <input type="text" class="form-control" id="_controlParameter" name="editval[str][_sControlParameter]" value="{{ d3ViewObject.d3GetModuleConfigParam('_sControlParameter') }}" aria-describedby="basic-addon3">
-                                        </div>
-                                        <div class="text-muted">{{ translate({ ident: "D3CNTRLPARAM_HELP" }) }}</div>
-                                    </div>
-                                </div>
-                                <button type="submit" name="save" class="btn btn-light w-100" onClick="Javascript:document.d3gtmformedit.fnc.value='save'">{{ translate({ ident: "GENERAL_SAVE" }) }}</button>
-                            </div>
-                        </div>
-                        <div class="accordion-item">
-                            <h2 class="accordion-header">
-                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-serversidetagging" aria-expanded="false" aria-controls="panelsStayOpen-serversidetagging">
-                                    {{ translate({ ident: "D3SERVERSIDETAGGING" }) }}
-                                </button>
-                            </h2>
-                            <div id="panelsStayOpen-serversidetagging" class="accordion-collapse collapse">
-                                <div class="accordion-body">
-                                    <div class="card bg-light rounded mb-3">
-                                        <div class="card-body">
-                                            {{ translate({ ident: "D3SERVERSIDETAGGING_HINT" }) }}
-                                        </div>
-                                    </div>
-                                    <div class="input-group mb-3">
-                                        <span class="input-group-text w-25" id="basic-addon3">{{ translate({ ident: "D3SERVERSIDETAGGING_TITLE_ACTIVE" }) }}</span>
-                                        <input type="text" class="form-control" id="_serversidetagging_js" name="editval[str][_sServersidetagging_js]" value="{{ d3ViewObject.d3GetModuleConfigParam('_sServersidetagging_js') }}" aria-describedby="basic-addon3">
-                                    </div>
-                                    <div class="input-group mb-3">
-                                        <span class="input-group-text w-25" id="basic-addon3">{{ translate({ ident: "D3SERVERSIDETAGGING_TITLE_PASSIVE" }) }}</span>
-                                        <input type="text" class="form-control" id="_serversidetagging_nojs" name="editval[str][_sServersidetagging_nojs]" value="{{ d3ViewObject.d3GetModuleConfigParam('_sServersidetagging_nojs') }}" aria-describedby="basic-addon3">
-                                    </div>
-
-                                    <div>
-                                        <button type="button" class="btn btn-light mt-3" data-bs-toggle="modal" data-bs-target="#exampleModal">
-                                            {{ translate({ ident: "D3DETAILED_DESC" }) }}
-                                        </button>
-
-                                        <!-- Modal -->
-                                        <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-                                            <div class="modal-dialog">
-                                                <div class="modal-content">
-                                                    <div class="modal-body">
-                                                        <h4>{{ translate({ ident: "D3SERVERSIDETAGGING_TITLE_ACTIVE" }) }}</h4>
-                                                        {{ translate({ ident: "D3SERVERSIDETAGGING_ACTIVE" }) }}
-                                                        <hr>
-                                                        <h4>{{ translate({ ident: "D3SERVERSIDETAGGING_TITLE_PASSIVE" }) }}</h4>
-                                                        {{ translate({ ident: "D3SERVERSIDETAGGING_PASSIVE" }) }}
-                                                    </div>
-                                                    <div class="modal-footer">
-                                                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ translate({ ident: "D3CLOSE" }) }}</button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <button type="submit" name="save" class="btn btn-light w-100" onClick="Javascript:document.d3gtmformedit.fnc.value='save'">{{ translate({ ident: "GENERAL_SAVE" }) }}</button>
-                            </div>
-                        </div>
-                        {% if d3ViewConfObject.d3IsUsercentricsCMPChosen() %}
-                        <div class="accordion-item">
-                            <h2 class="accordion-header">
-                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-usercentricsdynamicoptions" aria-expanded="false" aria-controls="panelsStayOpen-usercentricsdynamicoptions">
-                                    {{ translate({ ident: "D3USRCNTRCSDYNOPT" }) }}
-                                </button>
-                            </h2>
-                            <div id="panelsStayOpen-usercentricsdynamicoptions" class="accordion-collapse collapse">
-                                <div class="accordion-body">
-                                    <div class="card bg-light rounded mb-3">
-                                        <div class="card-body">
-                                            <div class="text-danger mb-3">
-                                                {{ translate({ ident: "D3USRCNTRCSCFG_WARNING" }) }}
-                                            </div>
-                                            {{ translate({ ident: "D3USRCNTRCSCFG_DOCS" }) }}
-                                        </div>
-                                    </div>
-
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" value="" id="enabledefaultmeasurementvalues" name="editval[bool][_blEnableMeasurementCapabilities]" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableMeasurementCapabilities') %}checked{% endif %}>
-                                        <label class="form-check-label" for="flexCheckDefault">
-                                            {{ translate({ ident: "D3USRCNTRCSCFG_ACT_INDIVDEFVAL" }) }}
-                                        </label>
-                                    </div>
-                                    <div class="input-group mb-3">
-                                        <span class="input-group-text w-25" id="basic-addon3">{{ translate({ ident: "D3USRCNTRCSCFG_STD_CNST" }) }}</span>
-                                        <textarea name="editval[str][_sMeasurementCapabilities]" class="form-control" rows="15">{{ d3ViewObject.d3GetModuleConfigParam('_sDefaultMeasurementCapabilities') }}</textarea>
-                                    </div>
-
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" value="" id="enableUsercentricsConsentModeApi" name="editval[bool][_blEnableUsercentricsConsentModeApi]" {% if d3ViewObject.d3GetModuleConfigParam('_blEnableUsercentricsConsentModeApi') %}checked{% endif %}>
-                                        <label class="form-check-label" for="flexCheckDefault">
-                                            {{ translate({ ident: "D3USRCNTRCSCFG_ACT_CNSTMDE_API" }) }}
-                                        </label>
-                                    </div>
-                                    <div class="input-group mb-3">
-                                        <span class="input-group-text w-25" id="basic-addon3">{{ translate({ ident: "D3USRCNTRCSCFG_CNSTMDE_API" }) }}</span>
-                                        <textarea name="editval[str][_sUsercentricsConsentModeApi]" class="form-control" rows="40">{{ d3ViewObject.d3GetModuleConfigParam('_sDefaultUsercentricsConsentModeApi') }}</textarea>
-                                    </div>
-                                </div>
-                                <button type="submit" name="save" class="btn btn-light w-100" onClick="Javascript:document.d3gtmformedit.fnc.value='save'">{{ translate({ ident: "GENERAL_SAVE" }) }}</button>
-                            </div>
-                        </div>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-</div>
\ No newline at end of file
diff --git a/views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig b/views/twig/d3gtmnoticelist.html.twig
similarity index 100%
rename from views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig
rename to views/twig/d3gtmnoticelist.html.twig
diff --git a/views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig b/views/twig/d3gtmrecommendationlist.html.twig
similarity index 100%
rename from views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig
rename to views/twig/d3gtmrecommendationlist.html.twig
diff --git a/views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig b/views/twig/d3gtmwishlist.html.twig
similarity index 100%
rename from views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig
rename to views/twig/d3gtmwishlist.html.twig