Index: /mods/wpsg_mod_deliverynote.class.php
===================================================================
--- /mods/wpsg_mod_deliverynote.class.php	(revision 6005)
+++ /mods/wpsg_mod_deliverynote.class.php	(revision 6006)
@@ -133,4 +133,5 @@
 			$this->shop->update_option('wpsg_mod_deliverynote_url_standard', $_REQUEST['wpsg_mod_deliverynote_url_standard']);
 			$this->shop->update_option('wpsg_mod_deliverynote_adressrow', $_REQUEST['wpsg_mod_deliverynote_adressrow']);			
+			$this->shop->update_option('wpsg_mod_deliverynote_produktattribute', $_REQUEST['wpsg_mod_deliverynote_produktattribute']);
 			$this->shop->update_option('wpsg_mod_deliverynote_hideCountry', $_REQUEST['wpsg_mod_deliverynote_hideCountry']);
 			$this->shop->update_option('wpsg_mod_deliverynote_anr', $_REQUEST['wpsg_mod_deliverynote_anr']);
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 6005)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 6006)
@@ -241,4 +241,5 @@
 			$this->shop->update_option('wpsg_rechnungen_pdfperpage', $_REQUEST['wpsg_rechnungen_pdfperpage']);
 			$this->shop->update_option("wpsg_rechnungen_pbeschreibung", $_REQUEST['wpsg_rechnungen_pbeschreibung']);
+			$this->shop->update_option("wpsg_rechnungen_produktattribute", $_REQUEST['wpsg_rechnungen_produktattribute']);
 			$this->shop->update_option("wpsg_mod_rechnungen_showgutschriftrechnung", $_REQUEST['wpsg_mod_rechnungen_showgutschriftrechnung']);
 			$this->shop->update_option('wpsg_mod_rechnungen_showanr', $_REQUEST['wpsg_mod_rechnungen_showanr']);
Index: /system/module.php
===================================================================
--- /system/module.php	(revision 6005)
+++ /system/module.php	(revision 6006)
@@ -37,13 +37,35 @@
 			'version' => '3.3.0',
 			'hide' => true
-		),		
-		'wpsg_mod_si' => array(
-			'modulname' => 'wpsg_mod_si',
-			'files' => array(
-				'mods/wpsg_mod_si.class.php',
-				'views/mods/mod_si'
+		),
+		'wpsg_mod_targo' => array(
+			'modulname' => 'wpsg_mod_targo',
+			'files' => array(
+				'mods/wpsg_mod_targo.class.php',
+				'views/mods/mod_targo',
+				'views/gfx/targologo.png'
 			),
 			'url' => '',
 			'hide' => true
+		),
+		'wpsg_mod_addressvalidation' => array(
+			'shop_product_id' => 39,
+			'modulname' => 'wpsg_mod_addressvalidation',
+			'files' => array(
+				'mods/wpsg_mod_addressvalidation.class.php',
+				'views/mods/mod_addressvalidation',
+				'mods/mod_addressvalidation'
+			),
+			'url' => '',
+			'hide' => false
+		),
+		'wpsg_mod_creditcard' => array(
+			'shop_product_id' => 38,
+			'modulname' => 'wpsg_mod_creditcard',
+			'files' => array(
+				'mods/wpsg_mod_creditcard.class.php',
+				'views/mods/mod_creditcard'
+			),
+			'url' => '',
+			'hide' => false
 		),
 		/*
@@ -60,25 +82,28 @@
 		),
 		*/
-		'wpsg_mod_targo' => array(
-			'modulname' => 'wpsg_mod_targo',
-			'files' => array(
-				'mods/wpsg_mod_targo.class.php',
-				'views/mods/mod_targo'
-			),
-			'url' => '',
-			'hide' => true
+
+		'wpsg_mod_si' => array(
+			'shop_product_id' => 36,
+			'modulname' => 'wpsg_mod_si',
+			'files' => array(
+				'mods/wpsg_mod_si.class.php',
+				'views/mods/mod_si'
+			),
+			'url' => 'https://shop.maennchen1.de/produkte/wpshopgermany-modul-sofortident/',
+			'hide' => true,
+			'free' => false
 		),
 		'wpsg_mod_amazon' => array(
-				'shop_product_id' => 34,
-				'modulname' => 'wpsg_mod_amazon',
-				'files' => array(
-						'mods/mod_amazon',
-						'mods/wpsg_mod_amazon.class.php',
-						'views/mods/mod_amazon'
-				),
-				'url' => 'https://shop.maennchen1.de/produkte/wpshopgermany-modul-amazon-payment/',
-				'version' => '3.3.0',
-				'hide' => true,
-				'free' => false
+			'shop_product_id' => 34,
+			'modulname' => 'wpsg_mod_amazon',
+			'files' => array(
+				'mods/mod_amazon',				
+				'mods/wpsg_mod_amazon.class.php',
+				'views/mods/mod_amazon'
+			),
+			'url' => 'https://shop.maennchen1.de/produkte/wpshopgermany-modul-amazon-payment/',
+			'version' => '3.3.0',
+			'hide' => false,
+			'free' => false
 		),
 		'wpsg_mod_paypalapi' => array(
@@ -327,5 +352,5 @@
 			'hide' => false,
 			'free' => false
-		), 
+		),
 		'wpsg_mod_produktartikel' => array(
 			'shop_product_id' => 17,
Index: /views/mods/mod_deliverynote/settings_edit.phtml
===================================================================
--- /views/mods/mod_deliverynote/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_deliverynote/settings_edit.phtml	(revision 6006)
@@ -19,4 +19,5 @@
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+                <div style="position:relative;">
                 <?php if ($this->view['wpsg_mod_deliverynote']['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
@@ -24,5 +25,5 @@
                 <a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" data-wpsg-tip="mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
                 <input type="file" name="wpsg_mod_deliverynote_bp">
                 <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = '
@@ -32,7 +33,9 @@
 					echo __($strSuffix);
 			} ?>
+			</div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+                <div style="position:relative;">
                 <?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
@@ -40,5 +43,5 @@
                 <a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" data-wpsg-tip="mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
                 <input type="file" name="wpsg_mod_deliverynote_logo">
                 <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = '  
@@ -48,4 +51,5 @@
 					echo __($strSuffix);
 				} ?>
+				</div>
             <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
 
@@ -134,5 +138,5 @@
 			
 			<?php if ($this->hasMod('wpsg_mod_produktattribute') == '1') {?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_rechnungen_produktattribute', __('Produktattribute auf der Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_rechnungen_produktattribute'), array('help' => 'wpsg_rechnungen_produktattribute')); ?>			
+				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_produktattribute', __('Produktattribute auf dem Lieferschein anzeigen', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_produktattribute'), array('help' => 'wpsg_mod_deliverynote_produktattribute')); ?>			
 			<?php }?>
 			
Index: /views/mods/mod_downloadplus/settings_edit.phtml
===================================================================
--- /views/mods/mod_downloadplus/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_downloadplus/settings_edit.phtml	(revision 6006)
@@ -54,14 +54,14 @@
 
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
+            <?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_individualisierungsbericht" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Mail fÃŒr Individualisierungsbericht', 'wpsg'), array('noP' => true)); ?>
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
+            <?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_kundenmail" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Mail fÃŒr Downloads an Kunden', 'wpsg'), array('noP' => true)); ?>
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgefÃŒhrt', 'wpsg')); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
+            <?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgefÃŒhrt', 'wpsg')); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_einstellungen_cron" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Letzte AusfÃŒhrung des Crons', 'wpsg'), array('noP' => true)); ?>
 
Index: /views/mods/mod_flexipay/settings_edit.phtml
===================================================================
--- /views/mods/mod_flexipay/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_flexipay/settings_edit.phtml	(revision 6006)
@@ -70,5 +70,5 @@
 ), $this->get_option('wpsg_mod_flexipay_language'), array('help' => 'wpsg_mod_flexipay_language')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_flexipay_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_flexipay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_flexipay_gebuehr')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_flexipay_mwst')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_flexipay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_flexipay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_flexipay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 <br />
Index: /views/mods/mod_giropay/settings_edit.phtml
===================================================================
--- /views/mods/mod_giropay/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_giropay/settings_edit.phtml	(revision 6006)
@@ -26,5 +26,5 @@
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_giropay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_giropay_giropay_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_giropay_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_giropay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_giropay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_giropay_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_giropay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_giropay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_giropay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_giropay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
@@ -46,5 +46,5 @@
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_creditcard_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_creditcard_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 		</div>
@@ -65,5 +65,5 @@
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_directdebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_directdebit_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_directdebit_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_directdebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 		</div>
Index: /views/mods/mod_keygen/settings_edit.phtml
===================================================================
--- /views/mods/mod_keygen/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_keygen/settings_edit.phtml	(revision 6006)
@@ -16,4 +16,5 @@
 		
 	<?php 
+	include WPSG_PATH.'/system/module.php';
 	echo wpsg_drawForm_TextStart();
 	echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true));
@@ -24,14 +25,14 @@
 	// Lizenz = 2	Pro Version
 	// Lizenz = 3	Enterprise Version
-	foreach ($this->arModule as $k => $v) { $i ++;
+	foreach ($arModule as $k => $v) { $i ++;
 		$mname = $k;
-		$lic = $v->lizenz;
+		//$lic = $v->lizenz;
 		//if ((key_exists('name', $v)) && ($lic == 1))
-		if ((key_exists('name', $v)))
+		//if ((key_exists('name', $v)))
 		{
-			$vname = $v->name;
+			//$vname = $v->name;
 
 			$chk = (@key_exists($mname, $_SESSION['wpsg_mod_keygen']['mods'] == '1'))?1:0;
-			echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($vname, 'wpsg'), 
+			echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($mname, 'wpsg'), 
 				$chk, array('value' => wpsg_hspc($mname),
 							'noHidden' => true,
Index: /views/mods/mod_micropayment/settings_edit.phtml
===================================================================
--- /views/mods/mod_micropayment/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_micropayment/settings_edit.phtml	(revision 6006)
@@ -32,5 +32,5 @@
 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_creditcard_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcard_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>			
@@ -53,5 +53,5 @@
 			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcardreservation_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>			
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcardreservation_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland'), array('help' => 'wpsg_mod_micropayment_cmwstland')); ?>			
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcardreservation_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>			
 		</div>
 	</div>
Index: /views/mods/mod_packagetracking/settings_edit_list.phtml
===================================================================
--- /views/mods/mod_packagetracking/settings_edit_list.phtml	(revision 6005)
+++ /views/mods/mod_packagetracking/settings_edit_list.phtml	(revision 6006)
@@ -26,5 +26,5 @@
 		<td class="wpsg_delcol">
 			
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_mod_packagetracking_name" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
 		
 		</td>
@@ -35,5 +35,5 @@
 		<td class="wpsg_delcol">
 		
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_mod_packagetracking_url" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
 							
 			<script type="text/javascript">/* <![CDATA[ */
Index: /views/mods/mod_rechnungen/settings_edit.phtml
===================================================================
--- /views/mods/mod_rechnungen/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_rechnungen/settings_edit.phtml	(revision 6006)
@@ -22,4 +22,5 @@
 -->		
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
@@ -27,5 +28,5 @@
                 <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
+                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" data-wpsg-tip="mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
                 <input type="file" name="wpsg_rechnungen_bp">
                 <?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
@@ -35,7 +36,9 @@
 					echo __($strSuffix);
                 } ?>
+				</div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['logo'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
@@ -43,5 +46,5 @@
                 <a href="<?php echo $this->view['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
                 <?php } ?>
-                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
+                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" data-wpsg-tip="mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
                 <input type="file" name="wpsg_rechnungen_logo">
                 <?php $strSuffix = ''; if ($this->view['logo'] !== false) { $strSuffix = '
@@ -51,4 +54,5 @@
                 	echo __($strSuffix);
                 } ?>
+                </div>
             <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
 
@@ -99,5 +103,5 @@
 					<td>			
 						<label><input type="checkbox" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> />&nbsp;<?php echo __("Aktiv", "wpsg"); ?></label>
-						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
+						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" data-wpsg-tip="mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
 					</td>
 				</tr>
Index: /views/mods/mod_relatedproducts/settings_edit.phtml
===================================================================
--- /views/mods/mod_relatedproducts/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_relatedproducts/settings_edit.phtml	(revision 6006)
@@ -12,5 +12,5 @@
 <div class="wpsg_mod_relatedproducts_showBasket_activ" style="display:none;">
 <?php echo wpsg_drawForm_Input('wpsg_mod_relatedproducts_showBasketLimit', __('Maximale Anzahl an angezeigten Produkten', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showBasketLimit'), array('help' => 'wpsg_mod_relatedproducts_showBasketLimits')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showBasketTemplate', __('Tempalte fÌr die Zubehörprodukte im Warenkorb', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showBasketTemplate', __('Template fÌr die Zubehörprodukte im Warenkorb', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
 </div>
 
Index: /views/mods/mod_userpayment/list.phtml
===================================================================
--- /views/mods/mod_userpayment/list.phtml	(revision 6005)
+++ /views/mods/mod_userpayment/list.phtml	(revision 6006)
@@ -16,10 +16,11 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
-        <?php echo $zv['id']; ?><a data-id="<?php echo $zv['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg_glyphicon_right glyphicon glyphicon-trash"></span></a>
+        <?php echo $zv['id']; ?><a data-id="<?php echo $zv['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg_glyphicon_right glyphicon glyphicon-trash form-control-feedback"></span></a>
         <?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_name_<?php echo $zv['id']; ?>"><?php echo $zv['name']; ?></span>
-        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_name"
+         rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -34,5 +35,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($zv['aktiv'] == '1')?'checked="checked"':''); ?> id="zv_<?php echo $zv['id']; ?>_aktiv" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_activ" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -55,5 +56,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_hint_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['hint']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_hint" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -68,5 +69,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_rabgeb_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['rabgeb']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_gebuehr" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
         <?php echo wpsg_drawForm_TextEnd(__('GebÃŒhr/Rabatt', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -84,5 +85,5 @@
         	echo wpsg_hspc($tax_groups[$zv['mwst_key']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -99,5 +100,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($zv['mwst_laender'] == '1')?'checked="checked"':''); ?> id="zv_mwst_laender_<?php echo $zv['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
Index: /views/mods/mod_versandarten/list.phtml
===================================================================
--- /views/mods/mod_versandarten/list.phtml	(revision 6005)
+++ /views/mods/mod_versandarten/list.phtml	(revision 6006)
@@ -25,5 +25,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_name_<?php echo $va['id']; ?>"><?php echo $va['name']; ?></span>
-        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_name" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -38,5 +38,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($va['aktiv'] == '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_activ" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -59,5 +59,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_hint_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['hint']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_hint" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -74,5 +74,5 @@
         echo wpsg_hspc($this->view['arTypen'][$va['typ']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_grundlage" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Grundlage', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -95,5 +95,5 @@
         	<?php } ?>
         </span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_versandzone" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Versandzone', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -110,5 +110,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_kosten_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['kosten']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_kostenschluessel" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
         <?php echo wpsg_drawForm_TextEnd(__('KostenschlÃŒssel', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -145,5 +145,5 @@
         	echo wpsg_hspc($tax_groups[$va['mwst_key']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
@@ -160,5 +160,5 @@
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> id="va_mwst_laender_<?php echo $va['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
Index: /views/mods/mod_voucherproduct/settings_edit.phtml
===================================================================
--- /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6006)
@@ -21,4 +21,5 @@
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
@@ -26,5 +27,5 @@
                 <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_paper" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
                 <input type="file" name="wpsg_mod_voucherproduct_bp">
                 <?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
@@ -34,4 +35,5 @@
 					echo __($strSuffix);
                 } ?>
+                </div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
 
@@ -41,5 +43,5 @@
             <?php echo wpsg_drawForm_TextStart(); ?>
 				<?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?>
-				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" style="float:right;" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a>
+				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_mail" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a>
 				
 	        <?php echo wpsg_drawForm_TextEnd(__('Gutscheinmail an Kunden', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
@@ -117,5 +119,5 @@
 					<td>			
 						<label><input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['aktiv']))?'checked="checked"':''); ?> />&nbsp;<?php echo __("Aktiv", "wpsg"); ?></label>
-						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig"></a>
+						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_fieldconfig" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_fieldconfig"></a>
 					</td>
 				</tr>
Index: /views/mods/mod_wirecard/settings_edit.phtml
===================================================================
--- /views/mods/mod_wirecard/settings_edit.phtml	(revision 6005)
+++ /views/mods/mod_wirecard/settings_edit.phtml	(revision 6006)
@@ -16,5 +16,5 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_gebuehr', __('GebÃŒhr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_wirecard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_mod_wirecard_mwst')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_wirecard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>