diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
index 58559fa..a453a20 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
@@ -39,33 +39,6 @@ function _groupExp(el) {
 
 <style type="text/css">
     <!--
-    .questbox {
-        background-color: #07f;
-        color:            white;
-        float:            right;
-        position:         relative;
-        display:          block;
-        padding:          1px 4px;
-        font-weight:      bold;
-        z-index:          98;
-        cursor:           help;
-        font-family:      Verdana, Arial, Helvetica, sans-serif;
-        font-size:        10px;
-        line-height:      12px;
-    }
-
-    .helptextbox {
-        background-color: white;
-        color:            black;
-        border:           1px solid black;
-        position:         absolute;
-        overflow:         hidden;
-        padding:          5px;
-        margin-top:       15px;
-        width:            300px;
-        z-index:          99;
-    }
-
     fieldset {
         border:           1px inset black;
         background-color: #F0F0F0;
@@ -90,7 +63,7 @@ function _groupExp(el) {
     -->
 </style>
 
-[{ if $readonly}]
+[{if $readonly}]
     [{assign var="readonly" value="readonly disabled"}]
 [{else}]
     [{assign var="readonly" value=""}]
@@ -109,7 +82,7 @@ function _groupExp(el) {
     <input type="hidden" name="cl" value="[{ $oViewConf->getActiveClassName() }]">
     <input type="hidden" name="fnc" value="save">
     <input type="hidden" name="oxid" value="[{ $oxid }]">
-    <input type="hidden" name="editval[d3_cfg_mod__oxid]" value="[{ $oxid }]">
+    <input type="hidden" name="editval[oxid]" value="[{ $oxid }]">
 
 <table border="0" width="98%">
     <tr>
@@ -117,7 +90,7 @@ function _groupExp(el) {
 
             [{if $oView->getValueStatus() == 'error'}]
                     <hr>
-                    <b>[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]</b>
+                    <span style="font-weight: bold;">[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]</span>
                     <br>
                     <br>
                     <span class="d3modcfg_btn fixed icon status_attention">
@@ -131,55 +104,51 @@ function _groupExp(el) {
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSGENERAL"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]
+                                <label for="blD3GASetCampaignTrack">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}]</label>
 [{*  _gaq.push(['_setCampaignTrack', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetCampaignTrack]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetCampaignTrack}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampaignTrack]">
+                                <input type="hidden" name="value[blD3GASetCampaignTrack]" value="0">
+                                <input id="blD3GASetCampaignTrack" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetCampaignTrack')}]checked[{/if}] name="value[blD3GASetCampaignTrack]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY"}]
+                                <label for="blD3GASetCampaignOnThankyouOnly">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY"}]</label>
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetCampaignOnThankyouOnly]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetCampaignOnThankyouOnly}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampaignOnThankyouOnly]">
+                                <input type="hidden" name="value[blD3GASetCampaignOnThankyouOnly]" value="0">
+                                <input id="blD3GASetCampaignOnThankyouOnly" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetCampaignOnThankyouOnly')}]checked[{/if}] name="value[blD3GASetCampaignOnThankyouOnly]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT"}]
+                                <label for="sD3GASetCampaignCookieTimeout">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT"}]</label>
 [{*  _gaq.push(['_setCampaignCookieTimeout', 31536000000]);  *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="30" value="[{$value->d3_cfg_mod__sD3GASetCampaignCookieTimeout}]" name="value[d3_cfg_mod__sD3GASetCampaignCookieTimeout]"> [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_MS"}]
+                                <input id="sD3GASetCampaignCookieTimeout" class="edittext ext_edittext" type="text" size="30" maxlength="30" value="[{$edit->getValue('sD3GASetCampaignCookieTimeout')}]" name="value[sD3GASetCampaignCookieTimeout]"> [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_MS"}]
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY"}]
+                                <label for="blD3GASetCampNoKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY"}]</label>
 [{* _gaq.push(['_setCampNOKey', 'ga_nooverride']);    *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetCampNoKey]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetCampNoKey}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampNoKey]">
+                                <input type="hidden" name="value[blD3GASetCampNoKey]" value="0">
+                                <input id="blD3GASetCampNoKey" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetCampNoKey')}]checked[{/if}] name="value[blD3GASetCampNoKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -187,21 +156,20 @@ function _groupExp(el) {
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_CODE"}]
+                                <label for="sD3GACampaignCode">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_CODE"}]</label>
                             </dt>
                             <dd>
-                                <textarea class="edittext ext_edittext" cols="80" rows="7" name="value[d3_cfg_mod__sD3GACampaignCode]">[{strip}]
-                                    [{$value->d3_cfg_mod__sD3GACampaignCode}]
+                                <textarea id="sD3GACampaignCode" class="edittext ext_edittext" cols="80" rows="7" name="value[sD3GACampaignCode]">[{strip}]
+                                    [{$edit->getValue('sD3GACampaignCode')}]
                                 [{/strip}]</textarea>
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_CODE_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -209,64 +177,59 @@ function _groupExp(el) {
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY"}]
+                                <label for="sD3GASetCampNameKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY"}]</label>
 [{*  _gaq.push(['_setCampNameKey', 'ga_campaign']);  *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$value->d3_cfg_mod__sD3GASetCampNameKey}]" name="value[d3_cfg_mod__sD3GASetCampNameKey]">
+                                <input id="sD3GASetCampNameKey" class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$edit->getValue('sD3GASetCampNameKey')}]" name="value[sD3GASetCampNameKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY"}]
+                                <label for="sD3GASetCampMediumKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY"}]</label>
 [{*  _gaq.push(['_setCampMediumKey', 'ga_medium']);  *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$value->d3_cfg_mod__sD3GASetCampMediumKey}]" name="value[d3_cfg_mod__sD3GASetCampMediumKey]">
+                                <input id="sD3GASetCampMediumKey" class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$edit->getValue('sD3GASetCampMediumKey')}]" name="value[sD3GASetCampMediumKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY"}]
+                                <label for="sD3GASetCampSourceKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY"}]</label>
 [{*  _gaq.push(['_setCampSourceKey', 'ga_source']);  *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$value->d3_cfg_mod__sD3GASetCampSourceKey}]" name="value[d3_cfg_mod__sD3GASetCampSourceKey]">
+                                <input id="sD3GASetCampSourceKey" class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$edit->getValue('sD3GASetCampSourceKey')}]" name="value[sD3GASetCampSourceKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY"}]
+                                <label for="sD3GASetCampTermKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY"}]</label>
 [{* _gaq.push(['_setCampTermKey', 'ga_term']);   *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$value->d3_cfg_mod__sD3GASetCampTermKey}]" name="value[d3_cfg_mod__sD3GASetCampTermKey]">
+                                <input id="sD3GASetCampTermKey" class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$edit->getValue('sD3GASetCampTermKey')}]" name="value[sD3GASetCampTermKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY"}]
+                                <label for="sD3GASetCampContentKey">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY"}]</label>
 [{*  _gaq.push(['_setCampContentKey', 'ga_content']);  *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$value->d3_cfg_mod__sD3GASetCampContentKey}]" name="value[d3_cfg_mod__sD3GASetCampContentKey]">
+                                <input id="sD3GASetCampContentKey" class="edittext ext_edittext" type="text" size="30" maxlength="100" value="[{$edit->getValue('sD3GASetCampContentKey')}]" name="value[sD3GASetCampContentKey]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -276,7 +239,7 @@ function _groupExp(el) {
                         <td class="edittext ext_edittext" align="left"><br>
                             <span class="d3modcfg_btn icon status_ok">
                                 <input type="submit" name="save" value="[{oxmultilang ident="D3_CFG_MOD_GENERAL_SAVE"}]">
-                                <div></div>
+                                <span></span>
                             </span>
                         </td>
                     </tr>
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
index 6a0640c..b2bda3b 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
@@ -39,33 +39,6 @@
 
 <style type="text/css">
     <!--
-    .questbox {
-        background-color: #07f;
-        color:            white;
-        float:            right;
-        position:         relative;
-        display:          block;
-        padding:          1px 4px;
-        font-weight:      bold;
-        z-index:          98;
-        cursor:           help;
-        font-family:      Verdana, Arial, Helvetica, sans-serif;
-        font-size:        10px;
-        line-height:      12px;
-    }
-
-    .helptextbox {
-        background-color: white;
-        color:            black;
-        border:           1px solid black;
-        position:         absolute;
-        overflow:         hidden;
-        padding:          5px;
-        margin-top:       15px;
-        width:            300px;
-        z-index:          99;
-    }
-
     fieldset {
         border:           1px inset black;
         background-color: #F0F0F0;
@@ -90,7 +63,7 @@
     -->
 </style>
 
-[{ if $readonly}]
+[{if $readonly}]
     [{assign var="readonly" value="readonly disabled"}]
 [{else}]
     [{assign var="readonly" value=""}]
@@ -109,7 +82,7 @@
     <input type="hidden" name="cl" value="[{ $oViewConf->getActiveClassName() }]">
     <input type="hidden" name="fnc" value="save">
     <input type="hidden" name="oxid" value="[{ $oxid }]">
-    <input type="hidden" name="editval[d3_cfg_mod__oxid]" value="[{ $oxid }]">
+    <input type="hidden" name="editval[oxid]" value="[{ $oxid }]">
 
 <table border="0" width="98%">
     <tr>
@@ -122,7 +95,7 @@
 
             [{elseif $oView->getValueStatus() == 'error'}]
                     <hr>
-                    <b>[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]</b>
+                    <span style="font-weight: bold;">[{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]</span>
                     <br>
                     <br>
                     <span class="d3modcfg_btn fixed icon status_attention">
@@ -136,55 +109,51 @@
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GAID"}]
+                                <label for="sD3GAId">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GAID"}]</label>
 [{*  _gaq.push(['_setAccount', 'UA_XXX']); *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="15" maxlength="20" value="[{$value->d3_cfg_mod__sD3GAId}]" name="value[d3_cfg_mod__sD3GAId]">
+                                <input id="sD3GAId" class="edittext ext_edittext" type="text" size="15" maxlength="20" value="[{$edit->getValue('sD3GAId')}]" name="value[sD3GAId]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_GAID_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP"}]
+                                <label for="blD3GAAnonymizeIP">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP"}]</label>
 [{*  _gaq.push(['_gat._anonymizeIp']); *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GAAnonymizeIP]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GAAnonymizeIP}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAnonymizeIP]">
+                                <input type="hidden" name="value[blD3GAAnonymizeIP]" value="0">
+                                <input id="blD3GAAnonymizeIP" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAAnonymizeIP')}]checked[{/if}] name="value[blD3GAAnonymizeIP]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME"}]
+                                <label for="blD3GATrackPageLoadTime">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME"}]</label>
 [{*  _gaq.push(['_gat._trackPageLoadTime']); *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GATrackPageLoadTime]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GATrackPageLoadTime}]checked[{/if}] name="value[d3_cfg_mod__blD3GATrackPageLoadTime]">
+                                <input type="hidden" name="value[blD3GATrackPageLoadTime]" value="0">
+                                <input id="blD3GATrackPageLoadTime" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GATrackPageLoadTime')}]checked[{/if}] name="value[blD3GATrackPageLoadTime]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING"}]
+                                <label for="blD3GAUseRemarketing">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING"}]</label>
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GAUseRemarketing]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]">
+                                <input type="hidden" name="value[blD3GAUseRemarketing]" value="0">
+                                <input id="blD3GAUseRemarketing" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAUseRemarketing')}]checked[{/if}] name="value[blD3GAUseRemarketing]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -192,31 +161,29 @@
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}]
+                                <label for="blD3GASendECommerce">[{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}]</label>
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASendECommerce]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GASendECommerce]">
+                                <input type="hidden" name="value[blD3GASendECommerce]" value="0">
+                                <input id="blD3GASendECommerce" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASendECommerce')}]checked[{/if}] name="value[blD3GASendECommerce]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO"}]
+                                <label for="blD3GAUseNetto">[{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO"}]</label>
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GAUseNetto]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GAUseNetto}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseNetto]">
+                                <input type="hidden" name="value[blD3GAUseNetto]" value="0">
+                                <input id="blD3GAUseNetto" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAUseNetto')}]checked[{/if}] name="value[blD3GAUseNetto]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -224,55 +191,51 @@
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER"}]
+                                <label for="blD3GAAllowDomainLinker">[{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER"}]</label>
 [{*  _gaq.push(['_setAllowLinker', true]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GAAllowDomainLinker]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GAAllowDomainLinker}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAllowDomainLinker]">
+                                <input type="hidden" name="value[blD3GAAllowDomainLinker]" value="0">
+                                <input id="blD3GAAllowDomainLinker" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAAllowDomainLinker')}]checked[{/if}] name="value[blD3GAAllowDomainLinker]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME"}]
+                                <label for="sD3GASetDomainName">[{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME"}]</label>
 [{*  _gaq.push(['_setDomainName', '.example-petstore.com']);   *}]
 [{*  if used _gaq.push(['_setAllowHash', false]);   *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="200" value="[{$value->d3_cfg_mod__sD3GASetDomainName}]" name="value[d3_cfg_mod__sD3GASetDomainName]">
+                                <input id="sD3GASetDomainName" class="edittext ext_edittext" type="text" size="30" maxlength="200" value="[{$edit->getValue('sD3GASetDomainName')}]" name="value[sD3GASetDomainName]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH"}]
+                                <label for="sD3GASetCookiePath">[{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH"}]</label>
 [{* _gaq.push(['_setCookiePath', '/path/of/cookie/']);   *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="150" value="[{$value->d3_cfg_mod__sD3GASetCookiePath}]" name="value[d3_cfg_mod__sD3GASetCookiePath]">
+                                <input id="sD3GASetCookiePath" class="edittext ext_edittext" type="text" size="30" maxlength="150" value="[{$edit->getValue('sD3GASetCookiePath')}]" name="value[sD3GASetCookiePath]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY"}]
+                                <label for="sD3GACookiePathCopy">[{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY"}]</label>
 [{* _gaq.push(['_cookiePathCopy', '/path/of/cookie/']);   *}]
                             </dt>
                             <dd>
-                                <input class="edittext ext_edittext" type="text" size="30" maxlength="150" value="[{$value->d3_cfg_mod__sD3GACookiePathCopy}]" name="value[d3_cfg_mod__sD3GACookiePathCopy]">
+                                <input id="sD3GACookiePathCopy" class="edittext ext_edittext" type="text" size="30" maxlength="150" value="[{$edit->getValue('sD3GACookiePathCopy')}]" name="value[sD3GACookiePathCopy]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -280,45 +243,42 @@
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO"}]
+                                <label for="blD3GASetClientInfo">[{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO"}]</label>
 [{*  _gaq.push(['_setClientInfo', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetClientInfo]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetClientInfo}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetClientInfo]">
+                                <input type="hidden" name="value[blD3GASetClientInfo]" value="0">
+                                <input id="blD3GASetClientInfo" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetClientInfo')}]checked[{/if}] name="value[blD3GASetClientInfo]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH"}]
+                                <label for="blD3GASetDetectFlash">[{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH"}]</label>
 [{*  _gaq.push(['_setDetectFlash', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetDetectFlash]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetDetectFlash}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetDetectFlash]">
+                                <input type="hidden" name="value[blD3GASetDetectFlash]" value="0">
+                                <input id="blD3GASetDetectFlash" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetDetectFlash')}]checked[{/if}] name="value[blD3GASetDetectFlash]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE"}]
+                                <label for="blD3GASetDetectTitle">[{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE"}]</label>
 [{*  _gaq.push(['_setDetectTitle', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GASetDetectTitle]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GASetDetectTitle}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetDetectTitle]">
+                                <input type="hidden" name="value[blD3GASetDetectTitle]" value="0">
+                                <input id="blD3GASetDetectTitle" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GASetDetectTitle')}]checked[{/if}] name="value[blD3GASetDetectTitle]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -326,21 +286,20 @@
                 <div class="groupExp">
                     <div class="">
                         <a class="rc" onclick="_groupExp(this); return false;" href="#">
-                            <b>
+                            <span style="font-weight: bold;">
                                 [{oxmultilang ident="D3_GOOGLEANALYTICS_CUSTOMVARS"}]
-                            </b>
+                            </span>
                         </a>
                         <dl>
                             <dt>
-                                [{oxmultilang ident="D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT"}]
+                                <label for="blD3GAUseCustomVars">[{oxmultilang ident="D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT"}]</label>
 [{*  _gaq.push(['_setCustomVar', false]);  *}]
                             </dt>
                             <dd>
-                                <input type="hidden" name="value[d3_cfg_mod__blD3GAUseCustomVars]" value="0">
-                                <input class="edittext ext_edittext" type="checkbox" value="1" [{if $value->d3_cfg_mod__blD3GAUseCustomVars}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseCustomVars]">
+                                <input type="hidden" name="value[blD3GAUseCustomVars]" value="0">
+                                <input id="blD3GAUseCustomVars" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('blD3GAUseCustomVars')}]checked[{/if}] name="value[blD3GAUseCustomVars]">
                                 [{ oxinputhelp ident="D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT_DESC" }]
                             </dd>
-                            <div class="spacer"></div>
                         </dl>
                     </div>
                 </div>
@@ -350,7 +309,7 @@
                         <td class="edittext ext_edittext" align="left"><br>
                             <span class="d3modcfg_btn icon status_ok">
                                 <input type="submit" name="save" value="[{oxmultilang ident="D3_CFG_MOD_GENERAL_SAVE"}]">
-                                <div></div>
+                                <span></span>
                             </span>
                         </td>
                     </tr>