Index: /mods/wpsg_mod_discount.class.php
===================================================================
--- /mods/wpsg_mod_discount.class.php	(revision 6004)
+++ /mods/wpsg_mod_discount.class.php	(revision 6005)
@@ -345,5 +345,5 @@
 		{
 			
-			$this->shop->view['wpsg_mod_discount']['discount'] = $oCustomergroup->discount;
+			$this->shop->view['wpsg_mod_discount']['discount'] = wpsg_getStr($oCustomergroup->data['discount']);
 			
 			$this->shop->render(WPSG_PATH_VIEW.'mods/mod_discount/customergroup_edit.phtml');
Index: /mods/wpsg_mod_micropayment.class.php
===================================================================
--- /mods/wpsg_mod_micropayment.class.php	(revision 6004)
+++ /mods/wpsg_mod_micropayment.class.php	(revision 6005)
@@ -615,5 +615,5 @@
 		{
 			
-			if ($_REQUEST['wpsg_plugin'] == 'wpsg_mod_micropayment' && $_REQUEST['module_action'] == 'pay')
+			if (wpsg_getStr($_REQUEST['wpsg_plugin']) == 'wpsg_mod_micropayment' && $_REQUEST['module_action'] == 'pay')
 			{
 				
Index: /mods/wpsg_mod_packagetracking.class.php
===================================================================
--- /mods/wpsg_mod_packagetracking.class.php	(revision 6004)
+++ /mods/wpsg_mod_packagetracking.class.php	(revision 6005)
@@ -21,5 +21,5 @@
 			$this->name = __('Paketverfolgung', 'wpsg');
 			$this->group = __('Versand', 'wpsg');
-			$this->desc = __('Ermöglicht Verwaltung und zusendung von Tracking Codes zur Paketverfolgung.', 'wpsg');
+			$this->desc = __('Ermöglicht Verwaltung und Zusendung von Tracking Codes zur Paketverfolgung.', 'wpsg');
 		
 			if (!defined('WPSG_TBL_TRACKINGPROVIDER')) define('WPSG_TBL_TRACKINGPROVIDER', $this->shop->prefix.'wpsg_trackingprovider');
Index: /mods/wpsg_mod_produktattribute.class.php
===================================================================
--- /mods/wpsg_mod_produktattribute.class.php	(revision 6004)
+++ /mods/wpsg_mod_produktattribute.class.php	(revision 6005)
@@ -24,5 +24,12 @@
 			$this->group = __('Produkte', 'wpsg');
 			$this->desc = __('Erlaubt es Produktattribute zu erstellen, die dann in der Produktverwaltung ausgefÃŒllt und im Frontend angezeigt werden.', 'wpsg');
-	
+
+			$this->arTypen = array(
+					'0' => __('Textfeld', 'wpsg'), 
+					'1' => __('Textfeld (RTE)', 'wpsg'), 
+					'2' => __('Auswahlfeld', 'wpsg'), 
+					'3' => __('Checkbox', 'wpsg')
+			);
+				
 		} // public function __construct()
 	 
@@ -65,4 +72,6 @@
 		{
 				
+			$this->shop->mod = $this;
+				
 			if ($_REQUEST['do'] == 'add')
 			{
@@ -85,5 +94,5 @@
 				parse_str($_REQUEST['wpsg_reorder'], $wpsg_reorder);
 			
-				foreach ((array)$wpsg_reorder['pa'] as $pos => $pa_id)
+				foreach ((array)$wpsg_reorder['pab'] as $pos => $pa_id)
 				{
 						
@@ -137,5 +146,7 @@
 					), "`id` = '".wpsg_q($_REQUEST['pa_id'])."'");
 					
-					die("1");
+					//die("1");
+					$value = $this->arTypen[$_REQUEST['value']];
+					die($value);
 					
 				}
@@ -168,5 +179,6 @@
 		{
 				
-			$this->shop->mod = &$this;
+			//$this->shop->mod = &$this;
+			$this->shop->mod = $this;
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktattribute/settings_edit.phtml');
 				
Index: /views/admin/form/checkbox.phtml
===================================================================
--- /views/admin/form/checkbox.phtml	(revision 6004)
+++ /views/admin/form/checkbox.phtml	(revision 6005)
@@ -28,5 +28,11 @@
 					
 					<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-						<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+						<?php if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>
+							<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"
+							class="glyphicon glyphicon wpsg_glyphicon_right glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>
+						<?php } else { ?>
+							<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"
+							class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
+						<?php } ?>
 					<?php } ?>
 					
@@ -34,4 +40,5 @@
 				
 			</label>
+			
 		</div>
 		
Index: /views/admin/form/input.phtml
===================================================================
--- /views/admin/form/input.phtml	(revision 6004)
+++ /views/admin/form/input.phtml	(revision 6005)
@@ -39,8 +39,8 @@
 				<?php if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>
 					<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"
-					class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true" style="text-align:right;"></a>
+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>
 				<?php } else { ?>
 					<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"
-					class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 				<?php } ?>
 			<?php } ?>
Index: /views/admin/form/link.phtml
===================================================================
--- /views/admin/form/link.phtml	(revision 6004)
+++ /views/admin/form/link.phtml	(revision 6005)
@@ -32,5 +32,5 @@
 
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
Index: /views/admin/form/select.phtml
===================================================================
--- /views/admin/form/select.phtml	(revision 6004)
+++ /views/admin/form/select.phtml	(revision 6005)
@@ -81,5 +81,5 @@
 			
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 			
Index: /views/admin/form/text.phtml
===================================================================
--- /views/admin/form/text.phtml	(revision 6004)
+++ /views/admin/form/text.phtml	(revision 6005)
@@ -13,5 +13,5 @@
 				
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
Index: /views/admin/form/textarea.phtml
===================================================================
--- /views/admin/form/textarea.phtml	(revision 6004)
+++ /views/admin/form/textarea.phtml	(revision 6005)
@@ -16,5 +16,5 @@
 			
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
Index: /views/admin/form/upload.phtml
===================================================================
--- /views/admin/form/upload.phtml	(revision 6004)
+++ /views/admin/form/upload.phtml	(revision 6005)
@@ -23,5 +23,5 @@
 				/>
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>
-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>
+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>
 			<?php } ?>
 		</div>
Index: /views/admin/hilfe.phtml
===================================================================
--- /views/admin/hilfe.phtml	(revision 6004)
+++ /views/admin/hilfe.phtml	(revision 6005)
@@ -9,22 +9,25 @@
 <div class="wpsg_hilfe" style="padding:5px; width:790px;">
 
-	<h1><?php echo __("Hilfe", "wpsg"); ?></h1>
-		
+	<?php echo wpsg_drawForm_AdminboxStart(__('Hilfe', 'wpsg')); ?>
 	<p><?php echo __("Hier ein kleiner Überblick, wo welche Information zu finden ist:", "wpsg"); ?></p>
-		
-	<h2><?php echo __("Tutorials", "wpsg"); ?></h2>		
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+	<?php echo wpsg_drawForm_AdminboxStart(__('Tutorials', 'wpsg')); ?>
 	<p><?php echo __("In den Tutorial haben wir praxisnahe Beispiele verwendet, um die einzelnen Funktionen nÀher zu erklÀren. Rechts im MenÌ können die Kategorien nÀher ausgewÀhlt werden, ganz oben gibt es ein Suchfenster, was ganz sehr gut funktioniert ;)", "wpsg"); ?></p>
 	<a href="http://wpshopgermany.maennchen1.de/category/tutorials/">http://wpshopgermany.maennchen1.de/category/tutorials/</a>
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
-	<h2><?php echo __("Forum", "wpsg"); ?></h2>
+	<?php echo wpsg_drawForm_AdminboxStart(__('Forum', 'wpsg')); ?>
 	<p><?php echo __("Alle Anfragen hinsichtlich Fehler, Inbetriebnahme und Administration beantworten wir zeitnah (wÀhrend unserer GeschÀftszeiten). Vielleicht ist deine Frage bereits im Forum gestellt und beantwortet worden? Das Suchformular dort ist auch sehr mÀchtig, probiere es doch mal aus!", "wpsg"); ?></p>
 	<p><?php echo __("Bitte nutze generell das Forum fÃŒr eine Support-Anfrage, <u>nicht</u> unser Kontaktformular oder Telefon.", "wpsg"); ?></p>
 	<a href="http://forum.maennchen1.de/">http://forum.maennchen1.de/</a>
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
-	<h2><?php echo __("Feature Wunschliste", "wpsg"); ?></h2>
+	<?php echo wpsg_drawForm_AdminboxStart(__('Feature Wunschliste', 'wpsg')); ?>
 	<p><?php echo __("Wir orientieren uns direkt am Markt. Insofern geben wir dir als User die Möglichkeit mitzuentscheiden, welches Feature wpShopGermany zukÌnftig haben wird. Du kannst selber einen Feature-Wunsch anlegen, oder fÌr einen bestehenden Wunsch deine Stimme abgeben.", "wpsg"); ?></p>
 	<a href="https://wpshopgermany.uservoice.com/">https://wpshopgermany.uservoice.com/</a>
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
-	<h2><?php echo __('Import aus wpShopGermany 2.5.8', 'wpsg'); ?></h2>
+	<?php echo wpsg_drawForm_AdminboxStart(__('Import aus wpShopGermany 2.5.8', 'wpsg')); ?>
 	<p><?php echo __('Mit dieser Funktion können sie den Export aus einem wpShopGermany 2.5.8 in diese Version importieren', 'wpsg'); ?></p>
 	<strong class="wpsg_error"><?php echo __('Sichern Sie in jedem Fall vorher ihre Daten!', 'wpsg'); ?></strong>
@@ -76,10 +79,12 @@
 	
 	</form>
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 	
-	<h2><?php echo __('Migration der alten MehrwertsteuersÀtze', 'wpsg'); ?></h2>
+	<?php echo wpsg_drawForm_AdminboxStart(__('Migration der alten MehrwertsteuersÀtze', 'wpsg')); ?>
 	<p><?php echo wpsg_translate(
 		__('Ab Version 3.5 wurden die MehrwertsteuersÀtze den LÀndern zugeordnet. Die alten MehrwertsteuersÀtze können <a href="#1#">hier</a> umgewandelt werden.', 'wpsg'),
 		WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=migratemwst'
 	); ?>
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 			
 </div>
Index: /views/admin/news.phtml
===================================================================
--- /views/admin/news.phtml	(revision 6004)
+++ /views/admin/news.phtml	(revision 6005)
@@ -16,5 +16,9 @@
 		<div class="wpsg_news <?php echo ((wpsg_news::isRead($news['id']))?'wpsg_news_read':''); ?>"> 
 			
-			<h2><a target="_blank" onclick="setTimeout(function() { location.href = location.href; }, 1000); return true;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=news&read=<?php echo rawurlencode($news['id']); ?>&noheader=1"><?php echo wpsg_hspc(wpsg_formatTimestamp($news['date'], true).' - '.$news['title']); ?></a></h2>
+			<?php 
+			$temp = '<a target="_blank" onclick="setTimeout(function() { location.href = location.href; }, 1000); return true;" href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=news&read='.rawurlencode($news['id']).'&noheader=1">'.wpsg_hspc(wpsg_formatTimestamp($news['date'], true).' - '.$news['title']).'</a>';
+			echo wpsg_drawForm_AdminboxStart(__($temp, 'wpsg'));
+			
+			?>
 		
 			<div class="markRead">
@@ -22,4 +26,5 @@
 			</div>
 			<div class="wpsg_news_content"><?php echo wpsg_news::prepareContent($news); ?></div>
+			<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 			 
 		</div>
Index: /views/admin/ueber.phtml
===================================================================
--- /views/admin/ueber.phtml	(revision 6004)
+++ /views/admin/ueber.phtml	(revision 6005)
@@ -6,67 +6,119 @@
 
 ?>
-<h2><?php echo __('Systemcheck', 'wpsg'); ?></h2>
 
-<div class="wpsg_form_field">
-	<div class="wpsg_form_left">
-		<?php echo __('Template Pfad:', 'wpsg'); ?>
+<div id="wpsg-bs" >
+	<div class="wpsg_admin_submenu" >
+		
+		<div class="list-group" id="wpsg_statistics_tabs">
+			<span class="list-group-head list-group-item"><?php echo __('Auswahl', 'wpsg'); ?></span>
+		
+				<a class="list-group-item <?php echo ((!isset($_REQUEST['subaction']))?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber'); ?>"><?php echo __('Über diese Installation', 'wpsg'); ?></a>
+
+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'phpinfo')?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=phpinfo'); ?>"><?php echo __('PHP-Info', 'wpsg'); ?></a>
+
+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'systemcheck')?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemcheck'); ?>"><?php echo __('Systemcheck', 'wpsg'); ?></a>
+		
+		</div>
+
+		<div style="clear:both; margin-bottom:10px; margin-left:0px; margin-right:8px;"></div>
+			
 	</div>
-	<div class="wpsg_form_right">
-		<?php echo WPSG_PATH_USERVIEW; ?>
-	</div>
-	<div class="wpsg_clear"></div>
 </div>
 
-<div class="wpsg_form_field">
-	<div class="wpsg_form_left">
-		<?php echo __('Sprachdatei:', 'wpsg'); ?>
+
+<div class="wpsg_admin_content">
+
+
+<?php if (!isset($_REQUEST['subaction'])) { ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Über diese Installation', 'wpsg')); ?>
+	
+	<div class="form-horizontal">
+	
+	<?php 
+	$arModule = array();
+	foreach ($this->arModule as $m_key => $m)
+	{
+	
+		$arModule[] = $m_key.((isset($m->version))?' '.$m->version:'');
+	
+	}
+	?>
+		
+	<?php echo wpsg_drawForm_Input('', __('wpShopGermany Version', 'wpsg'), WPSG_VERSION, array('text' => true)); ?>
+	<?php echo wpsg_drawForm_Input('', __('aktivierte wpShopGermany-Module', 'wpsg'), implode(', ', $arModule), array('text' => true)); ?>
+	<?php echo wpsg_drawForm_Input('', __('WordPress Version', 'wpsg'), get_bloginfo('version'), array('text' => true)); ?>
+	<?php echo wpsg_drawForm_Input('', __('PHP Version', 'wpsg'), phpversion(), array('text' => true)); ?>
+	<?php echo wpsg_drawForm_Input('', __('php.ini Einstellungen', 'wpsg'), "post_max_size: ". ini_get('post_max_size') . "<br />". "max_input_time: ". ini_get('max_input_time') . "<br />". "max_execution_time: ". ini_get('max_execution_time') . "<br />". "max_input_vars: ". ini_get('max_input_vars') . "<br />". "upload_max_filesize: ". ini_get('upload_max_filesize') . "<br />". "register_globals: ". ini_get('register_globals') . "<br />". "memory_limit: ". ini_get('memory_limit') . "<br />". "safe_mode: ". ini_get('safe_mode') . "<br />". "include_path: ". ini_get('include_path') . "<br />". "soap.wsdl_cache: ". ini_get('soap.wsdl_cache') . "<br />", array('text' => true, 'nohspc' => true)); ?>
+	<?php echo wpsg_drawForm_Input('', __('geladene PHP Erweiterungen', 'wpsg'), implode(', ',  get_loaded_extensions()), array('text' => true)); ?>
+	
+	<?php wpsg_drawForm_TextStart(); ?>		
+			<?php $arPlugins = $this->get_option('active_plugins'); ?>
+				<?php foreach ((array)$arPlugins as $plugin) { $plugin_data = get_plugin_data(WPSG_PATH_CONTENT.'plugins/'.$plugin); ?>
+				<?php echo $plugin_data['Name']; ?> / <?php echo $plugin_data['Version']; ?><br />
+				<?php } ?>
+
+	<?php echo wpsg_drawForm_TextEnd(__('aktive Wordpress Plugins', 'wpsg')); ?>	
+
+	<?php wpsg_drawForm_TextStart(); ?>		
+				<?php if (wpsg_isSizedArray($this->get_option('wpsg_plugintest_active_plugins'))) { ?>
+				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_restore&noheader=1'; ?>"><?php echo __('Vormals aktivierte Module wieder herstellen aus KompatibilitÀtstest', 'wpsg'); ?></a>
+				<?php } else { ?>
+				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_disable&noheader=1'; ?>"><?php echo __('Alle Plugins außer wpShopGermany deaktivieren (KompatibilitÀtstest)', 'wpsg'); ?></a>
+				<?php } ?>
+	<?php echo wpsg_drawForm_TextEnd(__('', 'wpsg')); ?>	
 	</div>
-	<div class="wpsg_form_right">
-		 <?php echo WPSG_PATH_TRANSLATION; ?>
+	
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php } ?>
+
+
+<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'phpinfo') { ?>	
+<?php echo wpsg_drawForm_AdminboxStart(__('PHP-Info', 'wpsg')); ?>
+	<div id="phpinfo" class="form-horizontal" style="max-width:100% !important; ">
+
+	<?php 
+	//echo phpinfo();
+	ob_start();
+	phpinfo();
+	$pinfo = ob_get_contents();
+	ob_end_clean();
+	
+	$pinfo = preg_replace ( '%^.*<body>(.*)</body>.*$%ms', '$1', $pinfo );
+	//echo $pinfo;
+	
+	//$pinfo = preg_replace("/(width):\".*?\"/", "\${1}=\"100%\"", $pinfo);
+	//$pinfo = preg_replace('/(width)(:)"([\d]+)"/', '${1}${2}"100%"', $pinfo);
+	//$pinfo = str_replace('width: 934px;', 'width:100%;', $pinfo);
+	
+	echo $pinfo;
+	//jQuery('#phpinfo').replaceWith($pinfo);
+
+	?>
 	</div>
-	<div class="wpsg_clear"></div>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php } ?>
+
+
+<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'systemcheck') { ?>	
+<?php echo wpsg_drawForm_AdminboxStart(__('Systemcheck', 'wpsg')); ?>
+
+	<div class="form-horizontal">
+	<?php wpsg_drawForm_TextStart(); ?>		
+	<?php echo WPSG_PATH_USERVIEW; ?>
+
+	<?php echo wpsg_drawForm_TextEnd(__('Template Pfad', 'wpsg')); ?>	
+
+	<?php wpsg_drawForm_TextStart(); ?>		
+	<?php echo WPSG_PATH_TRANSLATION; ?>
+
+	<?php echo wpsg_drawForm_TextEnd(__('Sprachdatei', 'wpsg')); ?>	
+	</div>
+	
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php } ?>
+
+
 </div>
-		
-<h2><?php echo __("ÃŒber diese Installation", "wpsg"); ?></h2>
-	
-<?php 
-
-$arModule = array();
-foreach ($this->arModule as $m_key => $m)
-{
-
-	$arModule[] = $m_key.((isset($m->version))?' '.$m->version:'');
-
-}
-
-?>
-	
-<?php echo wpsg_drawForm_Input('', __('wpShopGermany Version', 'wpsg'), WPSG_VERSION, array('text' => true)); ?>
-<?php echo wpsg_drawForm_Input('', __('aktivierte wpShopGermany-Module', 'wpsg'), implode(', ', $arModule), array('text' => true)); ?>
-<?php echo wpsg_drawForm_Input('', __('WordPress Version', 'wpsg'), get_bloginfo('version'), array('text' => true)); ?>
-<?php echo wpsg_drawForm_Input('', __('PHP Version', 'wpsg'), phpversion(), array('text' => true)); ?>
-<?php echo wpsg_drawForm_Input('', __('php.ini Einstellungen', 'wpsg'), "post_max_size: ". ini_get('post_max_size') . "<br />". "max_input_time: ". ini_get('max_input_time') . "<br />". "max_execution_time: ". ini_get('max_execution_time') . "<br />". "max_input_vars: ". ini_get('max_input_vars') . "<br />". "upload_max_filesize: ". ini_get('upload_max_filesize') . "<br />". "register_globals: ". ini_get('register_globals') . "<br />". "memory_limit: ". ini_get('memory_limit') . "<br />". "safe_mode: ". ini_get('safe_mode') . "<br />". "include_path: ". ini_get('include_path') . "<br />". "soap.wsdl_cache: ". ini_get('soap.wsdl_cache') . "<br />", array('text' => true, 'nohspc' => true)); ?>
-<?php echo wpsg_drawForm_Input('', __('geladene PHP Erweiterungen', 'wpsg'), implode(', ',  get_loaded_extensions()), array('text' => true)); ?>
-
-<div class="wpsg_form_field">
-	<div class="wpsg_form_left">
-		<label for=""><?php echo __('aktive Wordpress Plugins', 'wpsg'); ?>:</label>
-	</div>
-	<div class="wpsg_form_right">
-		<?php $arPlugins = $this->get_option('active_plugins'); ?>
-		<p>
-			<?php foreach ((array)$arPlugins as $plugin) { $plugin_data = get_plugin_data(WPSG_PATH_CONTENT.'plugins/'.$plugin); ?>
-			<?php echo $plugin_data['Name']; ?> / <?php echo $plugin_data['Version']; ?><br />
-			<?php } ?>
-		</p>
-		<br />
-		<p>
-			<?php if (wpsg_isSizedArray($this->get_option('wpsg_plugintest_active_plugins'))) { ?>
-			<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_restore&noheader=1'; ?>"><?php echo __('Vormals aktivierte Module wieder herstellen aus KompatibilitÀtstest', 'wpsg'); ?></a>
-			<?php } else { ?>
-			<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_disable&noheader=1'; ?>"><?php echo __('Alle Plugins außer wpShopGermany deaktivieren (KompatibilitÀtstest)', 'wpsg'); ?></a>
-			<?php } ?>
-		</p>
-	</div>
-	<div class="wpsg_clear"></div>
-</div>
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 6004)
+++ /views/css/admin.css	(revision 6005)
@@ -221,6 +221,12 @@
 #wpsg-bs.wpsg_voucher .col_checkbox { width:20px; }
 .wpsg_mod_voucher_fieldtable { font-size:12px; }
-
-/* Modul Lieferschein */
+.wpsg_mod_voucher_fieldtable .col_bezeichnung { width:25px; }
+.wpsg_mod_voucher_fieldtable .col_x,
+.wpsg_mod_voucher_fieldtable .col_y { width:60px; }
+.wpsg_mod_voucher_fieldtable .col_color { width:80px; }
+.wpsg_mod_voucher_fieldtable .col_groesse { width:60px; }
+
+
+/* Modul Lieferschein/Rechnung */
 .wpsg_mod_deliverynote_fieldtable { font-size:12px; }
 .wpsg_mod_deliverynote_fieldtable .col_bezeichnung { width:125px; }
@@ -228,5 +234,5 @@
 .wpsg_mod_deliverynote_fieldtable .col_y { width:50px; }
 .wpsg_mod_deliverynote_fieldtable .col_color { width:80px; }
-.wpsg_mod_deliverynote_fieldtable .col_groesse { width:50px; }
+.wpsg_mod_deliverynote_fieldtable .col_groesse { width:60px; }
 .wpsg_foottextlist .col_standard { text-align:center; }
 
@@ -254,4 +260,13 @@
 .wpsg_pv_table .wpsg_label { text-align:left; }
 
+/* Produktattribute */ 
+.wpsg_pa_table { width:100%; }
+.wpsg_pa_table tr td { vertical-align:top; }
+.wpsg_pa_table .wpsg_id { width:20px; text-align:left; cursor:move; }
+.wpsg_pa_table .wpsg_action { width:80px; text-align:center; }
+.wpsg_pa_table .wpsg_typ { width:150px; text-align:left; }
+.wpsg_pa_table .wpsg_show { width:100px; text-align:center; }
+.wpsg_pa_table .wpsg_label { text-align:left; }
+
 /* Bestellvariablen */
 .wpsg_ov_table { width:100%; }
Index: /views/mods/mod_core/admin_register.phtml
===================================================================
--- /views/mods/mod_core/admin_register.phtml	(revision 6004)
+++ /views/mods/mod_core/admin_register.phtml	(revision 6005)
@@ -7,23 +7,34 @@
 
 ?>
-<div class="wpsg_admin_submenu">
-	
-	<div class="head">
-		<div class="title"><?php echo __("Lizenzverwaltung", "wpsg"); ?></div>			
-		<div style="clear:both;"></div>
+
+<div id="wpsg-bs" >
+	<div class="wpsg_admin_submenu" >
+		
+		<div class="list-group" id="wpsg_statistics_tabs">
+			<span class="list-group-head list-group-item"><?php echo __('Auswahl', 'wpsg'); ?></span>
+		
+				<a class="list-group-item <?php echo ((!isset($_REQUEST['subaction']))?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung'); ?>"><?php echo __('Registrierungsdaten', 'wpsg'); ?></a>
+
+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'domains')?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domains'); ?>"><?php echo __('Domainverwaltung', 'wpsg'); ?></a>
+
+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'module')?'active':''); ?>" 
+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=module'); ?>"><?php echo __('Modulaktivierung', 'wpsg'); ?></a>
+		
+		</div>
+
+		<div style="clear:both; margin-bottom:10px; margin-left:0px; margin-right:8px;"></div>
+			
 	</div>
+</div>
 
-	<ul>		
-		<li class="<?php echo ((!isset($_REQUEST['subaction']))?'current':''); ?>"><a href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung'); ?>"><?php echo __('Registrierungsdaten', 'wpsg'); ?></a></li>
-		<li class="<?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'domains')?'current':''); ?>"><a href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domains'); ?>"><?php echo __('Domainverwaltung', 'wpsg'); ?></a></li>		
-		<li class="<?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'module')?'current':''); ?>"><a href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=module'); ?>"><?php echo __('Modulaktivierung', 'wpsg'); ?></a></li>
-	</ul>
-			
-</div>
- 
+
 <div class="wpsg_admin_content">
 	
 	<?php if (!isset($_REQUEST['subaction'])) { ?>
-		<h2><?php echo __('Registrierungsdaten', 'wpsg'); ?></h2>
+		<?php echo wpsg_drawForm_AdminboxStart(__('Registrierungsdaten', 'wpsg')); ?>
+
+		<div class="form-horizontal">
 		 
 		<?php echo wpsg_drawForm_Input('register_lizenz', __('Lizenzart', 'wpsg'), $this->view['typ'], array('readonly' => true, 'disabled' => true)); ?>
@@ -44,9 +55,14 @@
 			
 		</form>
+		</div>
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+		
 	<?php } ?>
 	
 	<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'domains') { ?>	
-		<h2><?php echo __('Registrierte Domains', 'wpsg'); ?></h2>
-			
+		<?php echo wpsg_drawForm_AdminboxStart(__('Registrierte Domains', 'wpsg')); ?>
+		
+		<div class="form-horizontal">
+	
 		<?php if (sizeof($this->view['data']['domains']) <= 0) { ?>
 		<p><?php echo __('Noch keine Domains registriert.', 'wpsg'); ?>
@@ -77,10 +93,13 @@
 			</form>
 			<?php } ?>		
-		
 		<?php } ?>
+		</div>
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 	<?php } ?>
 	
 	<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'module') { ?>	
-		<h2><?php echo __('Weitere Module', 'wpsg'); ?></h2>
+		<?php echo wpsg_drawForm_AdminboxStart(__('Weitere Module', 'wpsg')); ?>
+		
+		<div class="form-horizontal">
 		
 		<p><?php echo wpsg_translate(__('Erweitern Sie Ihre wpShopGermany-Lizenz um weitere Funktionen, indem Sie <a href="#1#">weitere Module installieren</a> und ihrer bestehenden wpShopGermany-Lizenz hinzufÃŒgen.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module'); ?></p>
@@ -94,6 +113,7 @@
 			<input type="submit" value="<?php echo __('wpShopGermany Lizenz erweitern', 'wpsg'); ?>" class="button-primary" />
 			
-		</form>		
-		 
+		</form>	
+		</div>	
+		<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 	<?php } ?>
 	
Index: /views/mods/mod_discount/produkt_addedit_sidebar.phtml
===================================================================
--- /views/mods/mod_discount/produkt_addedit_sidebar.phtml	(revision 6004)
+++ /views/mods/mod_discount/produkt_addedit_sidebar.phtml	(revision 6005)
@@ -6,10 +6,7 @@
 
 ?>
-<div id="wpsg_discount" class="panel panel-default">
-	<div class="panel-heading clearfix">
-		<h3 class="panel-title">
-			<?php echo __('Produktrabatt', 'wpsg'); ?>
-		</h3>
-	</div>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktrabatt', 'wpsg')); ?>
+
 	<div class="inside">	
 		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>
@@ -21,3 +18,4 @@
 	
 	</div>
-</div>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
Index: /views/mods/mod_export/fields.phtml
===================================================================
--- /views/mods/mod_export/fields.phtml	(revision 6004)
+++ /views/mods/mod_export/fields.phtml	(revision 6005)
@@ -85,5 +85,5 @@
             <td style="position:relative;">
                 
-                <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" data-wpsg-tip="mod_export_userformat" class="glyphicon glyphicon-info-sign" style="float:right;"></a>
+                <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_export_userformat" data-wpsg-tip="mod_export_userformat" class="glyphicon glyphicon-question-sign" style="float:right;"></a>
                
                 <script type="text/javascript">/* <![CDATA[ */
Index: /views/mods/mod_gutschein/index.phtml
===================================================================
--- /views/mods/mod_gutschein/index.phtml	(revision 6004)
+++ /views/mods/mod_gutschein/index.phtml	(revision 6005)
@@ -106,5 +106,5 @@
 
                                 <?php $comment = $oVoucher->comment; if (wpsg_isSizedString($comment)) { ?>
-                                <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"></a>
+                                <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>
                                 <?php } ?>
 
Index: /views/mods/mod_keygen/settings_edit.phtml
===================================================================
--- /views/mods/mod_keygen/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_keygen/settings_edit.phtml	(revision 6005)
@@ -15,83 +15,33 @@
 	<?php echo wpsg_drawForm_Input('wpsg_mod_keygen[wpsg_mod_keygen_maxver]', __('Maximale Versionsnummer', 'wpsg'), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']:'9.9.9')); ?>
 		
-	<div class="wpsg_form_field">
-		<div class="wpsg_form_left">
-			<label><?php echo __('Module', 'wpsg'); ?>:</label>
-		</div>
-		<div class="wpsg_form_right">
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_rechnungen'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_rechnungen" />&nbsp;<?php echo __('Rechnungsmodul', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_downloadplus'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_downloadplus" />&nbsp;<?php echo __('Downloadplus', 'wpsg'); ?>
-			</label><br /> 
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_statistics'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_statistics" />&nbsp;<?php echo __('Statistikmodul', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_produktartikel'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_produktartikel" />&nbsp;<?php echo __('Produktartikel', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_videodownload'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_videodownload" />&nbsp;<?php echo __('Videodownloadmodul', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">			
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_ordercondition'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_ordercondition" />&nbsp;<?php echo __('Bestellbedingung', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">			
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_voucherproduct'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_voucherproduct" />&nbsp;<?php echo __('Gutscheinprodukt', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_orderupload'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_orderupload" />&nbsp;<?php echo __('Bestellupload', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_deliverynote'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_deliverynote" />&nbsp;<?php echo __('Lieferschein', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_abo'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_abo" />&nbsp;<?php echo __('Abo Produkte', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_shs'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_shs" />&nbsp;<?php echo __('Internetkasse', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_customergroup'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_customergroup" />&nbsp;<?php echo __('Kundengruppen', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-				<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_packagetracking'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_packagetracking" />&nbsp;<?php echo __('Paketverfolgung', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_request'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_request" />&nbsp;<?php echo __('Anfrage Produkte', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_minquantity'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_minquantity" />&nbsp;<?php echo __('Mindestbestellmenge', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_minrequest'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_minrequest" />&nbsp;<?php echo __('Mindestbestellwert', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_paypalapi'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_paypalapi" />&nbsp;<?php echo __('PayPal PLUS', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-			<label style="line-height:25px;">
-				<input class="checkbox" type="checkbox" name="wpsg_mod_keygen[mods][]" <?php echo ((@$_SESSION['wpsg_mod_keygen']['mods']['wpsg_mod_amazon'] == '1')?'checked="checked"':''); ?> value="wpsg_mod_amazon" />&nbsp;<?php echo __('AmazonPayment', 'wpsg'); ?>
-			</label>
-			<div class="wpsg_clear"></div>
-		</div>	
-	</div>
+	<?php 
+	echo wpsg_drawForm_TextStart();
+	echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true));
+	
+	echo wpsg_drawForm_TextStart(); 
+	$i = 0;
+	// Lizenz = 1	Light Version
+	// Lizenz = 2	Pro Version
+	// Lizenz = 3	Enterprise Version
+	foreach ($this->arModule as $k => $v) { $i ++;
+		$mname = $k;
+		$lic = $v->lizenz;
+		//if ((key_exists('name', $v)) && ($lic == 1))
+		if ((key_exists('name', $v)))
+		{
+			$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'), 
+				$chk, array('value' => wpsg_hspc($mname),
+							'noHidden' => true,
+							'fullWidth' => true
+			));
+		}
+		
+	}
+	echo wpsg_drawForm_TextEnd(__('', 'wpsg'), array('noP' => true));
+	?>
+
 	
 	<input type="hidden" name="aktiv" value="1" />
@@ -102,19 +52,11 @@
 </form>
 
-<br />
-
 <form name="form1" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;noheader=1" method="post" enctype="multipart/form-data">
 		
-	<div class="wpsg_form_field">
-		<div class="wpsg_form_left">
-			<label><?php echo __('Module', 'wpsg'); ?>:</label>
-		</div>
-		<div class="wpsg_form_right">
+	<?php echo wpsg_drawForm_TextStart(); ?>
 			<input type="file" name="testkey" />
-		</div>
-	</div>
 	
-	<br />
-	
+	<?php echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true)); ?>
+
 	<input type="hidden" name="aktiv" value="1" />
 	
Index: /views/mods/mod_ordervars/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_ordervars/checkout_inner_prebutton.phtml	(revision 6004)
+++ /views/mods/mod_ordervars/checkout_inner_prebutton.phtml	(revision 6005)
@@ -18,5 +18,5 @@
 				<label class="wpshopgermany_checkout" for="wpsg_mod_ordervars_<?php echo $ov['id']; ?>">
 					<input type="hidden" value="0" name="wpsg_mod_ordervars[<?php echo $ov['id']; ?>]" />
-					<input class="<?php echo ((in_array("wpsg_mod_ordervars_".$ov['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_mod_ordervars_<?php echo $ov['id']; ?>" <?php echo (($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" name="wpsg_mod_ordervars[<?php echo $ov['id']; ?>]" /><?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?><?php if ($ov['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>
+					<input class="<?php echo ((in_array("wpsg_mod_ordervars_".$ov['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_mod_ordervars_<?php echo $ov['id']; ?>" <?php echo ((wpsg_getStr($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']]) == '1')?'checked="checked"':''); ?> type="checkbox" value="1" name="wpsg_mod_ordervars[<?php echo $ov['id']; ?>]" /><?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?><?php if ($ov['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<?php } else { ?>	
@@ -30,10 +30,10 @@
 						<option value=""><?php echo __('Bitte wÀhlen', 'wpsg'); ?></option>
 						<?php $ov['auswahl'] = explode('|', $ov['auswahl']); foreach ((array)$ov['auswahl'] as $option) { ?>
-						<option <?php echo (($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']] == $option)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
+						<option <?php echo ((wpsg_getStr($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']]) == $option)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
 						<?php } ?>
 					</select>
 					<?php } else if ($ov['typ'] == '2') { // Textfeld ?>
-					<input class="<?php echo ((in_array("wpsg_mod_ordervars_".$ov['id'], (array)$this->view['error']))?'wpsg_error':''); ?> <?php echo (($ov['pflicht'] == '1')?'validate[required]':''); ?>" type="text" name="wpsg_mod_ordervars[<?php echo $ov['id']; ?>]" value="<?php echo wpsg_hspc($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']]); ?>" id="wpsg_mod_ordervars_<?php echo $ov['id']; ?>" />
-					<?php } ?> 
+					<input class="<?php echo ((in_array("wpsg_mod_ordervars_".$ov['id'], (array)$this->view['error']))?'wpsg_error':''); ?> <?php echo (($ov['pflicht'] == '1')?'validate[required]':''); ?>" type="text" name="wpsg_mod_ordervars[<?php echo $ov['id']; ?>]" value="<?php echo wpsg_hspc(wpsg_getStr($_SESSION['wpsg']['wpsg_mod_ordervars'][$ov['id']])); ?>" id="wpsg_mod_ordervars_<?php echo $ov['id']; ?>" />
+					<?php } ?>
 				</div>
 				<?php } ?>
Index: /views/mods/mod_packagetracking/settings_edit.phtml
===================================================================
--- /views/mods/mod_packagetracking/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_packagetracking/settings_edit.phtml	(revision 6005)
@@ -60,5 +60,5 @@
 			<div class="fulltab">
 				<?php echo __('Anbieter fÃŒr Paketverfolgung', 'wpsg'); ?>
-				<a title="<?php echo __('Neuen Anbieter anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_mod_packagetracking_add();"></a>
+				<br /><br />
 			</div>
 		</div>
Index: /views/mods/mod_packagetracking/settings_edit_list.phtml
===================================================================
--- /views/mods/mod_packagetracking/settings_edit_list.phtml	(revision 6004)
+++ /views/mods/mod_packagetracking/settings_edit_list.phtml	(revision 6005)
@@ -18,9 +18,9 @@
 		<td class="wpsg_value"><?php echo $p['id']; ?></td>	
 		<td class="wpsg_delcol">
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Anbieter löschen', 'wpsg'); ?>" onclick="return wpsg_mod_packagetracking_delete(<?php echo $p['id']; ?>);"></a>					
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-trash" href="#" title="<?php echo __('Anbieter löschen', 'wpsg'); ?>" onclick="return wpsg_mod_packagetracking_delete(<?php echo $p['id']; ?>);"></a>					
 		</td>
 	</tr>
 	<tr>
-		<td class="wpsg_label"><?php echo __('Name', 'wpsg'); ?>:</td>
+		<td class="wpsg_label"><?php echo __('Name', 'wpsg'); ?>:&nbsp;&nbsp;&nbsp;</td>
 		<td class="wpsg_value wpsg_editable" id="tp_<?php echo $p['id']; ?>_name"><?php echo wpsg_hspc(__($p['name'], 'wpsg')); ?></td>
 		<td class="wpsg_delcol">
@@ -78,2 +78,5 @@
 <p><?php echo __('Es wurden noch keine Anbieter fÃŒr die Paketverfolgung angelegt.', 'wpsg'); ?>
 <?php } ?>
+
+<br /><br />
+<a href="#" onclick="return wpsg_mod_packagetracking_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neuen Anbieter anlegen</a>
Index: /views/mods/mod_productvariants/admin_html.phtml
===================================================================
--- /views/mods/mod_productvariants/admin_html.phtml	(revision 6004)
+++ /views/mods/mod_productvariants/admin_html.phtml	(revision 6005)
@@ -13,11 +13,7 @@
 
     </div>
-    <div class="modal-footer">
-
-		<button type="button" class="btn-sm wpsg_mod_productvariants_variants btn btn-default" onclick="return wpsg_mod_productvariants_add();"><span class="glyphicon glyphicon-plus"></span>&nbsp;<?php
-
-			echo ((wpsg_isSizedInt($_REQUEST['edit_id'])?__('Neue Produktvariante', 'wpsg'):__('Neue Variante', 'wpsg')));
-
-		?></button>
+    <div class="modal-footer1">
+
+	<a href="#" onclick="return wpsg_mod_productvariants_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neue Produktvariante anlegen', 'wpsg'); ?></a>
 
     </div>
Index: /views/mods/mod_productvariants/admin_show.phtml
===================================================================
--- /views/mods/mod_productvariants/admin_show.phtml	(revision 6004)
+++ /views/mods/mod_productvariants/admin_show.phtml	(revision 6005)
@@ -107,5 +107,5 @@
 																			 
 			}			
-		} ).disableSelection();
+		} );
 
     /* ]]> */</script>
Index: /views/mods/mod_productvars/pv_list.phtml
===================================================================
--- /views/mods/mod_productvars/pv_list.phtml	(revision 6004)
+++ /views/mods/mod_productvars/pv_list.phtml	(revision 6005)
@@ -42,9 +42,10 @@
 			</div>
 		</td>
-		<td id="wpsg_pv_typ_<?php echo $pv['id']; ?>" class="wpsg_typ wpsg_editable"><?php echo $this->mod->arTypen[$pv['typ']]; ?></td>
+		<td class="col_typ">
+		    <span id="wpsg_pv_typ_<?php echo $pv['id']; ?>" class="wpsg_editable"><?php echo $this->mod->arTypen[$pv['typ']]; ?></span></td>
 		<td class="wpsg_pflicht"><input type="checkbox" <?php echo (($pv['pflicht'] == '1')?'checked="checked"':''); ?> id="wpsg_pv_pflicht_<?php echo $pv['id']; ?>" /></td>
 		<td class="wpsg_delcol">
 		
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);"></a>
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-trash" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);"></a>
 		
 			<script type="text/javascript">/* <![CDATA[ */
Index: /views/mods/mod_produktartikel/produkt_addedit_content.phtml
===================================================================
--- /views/mods/mod_produktartikel/produkt_addedit_content.phtml	(revision 6004)
+++ /views/mods/mod_produktartikel/produkt_addedit_content.phtml	(revision 6005)
@@ -32,3 +32,2 @@
 		
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
-
Index: /views/mods/mod_produktattribute/list.phtml
===================================================================
--- /views/mods/mod_produktattribute/list.phtml	(revision 6004)
+++ /views/mods/mod_produktattribute/list.phtml	(revision 6005)
@@ -9,31 +9,26 @@
 <p><?php echo __('Keine Produktattribute hinterlegt.', 'wpsg'); ?></p>
 <?php } else { ?>
-<table class="wpsg_mod_produktattribute_table table">
+<table class="wpsg_pa_table table table-body-striped" id="wpsg_pa_table">
 	<thead>
 		<tr>
-			<th class="col_id"><?php echo __('ID', 'wpsg'); ?></th>
-			<th class="col_name" colspan="2"><?php echo __('Bezeichnung', 'wpsg'); ?></th>			
-			<th class="col_show"><?php echo __('Anzeigen', 'wpsg'); ?></th>
-			<th class="col_typ"><?php echo __('Typ', 'wpsg'); ?></th>		 
-			<th class="col_action"></th>
+			<th class="wpsg_id"><?php echo __('ID', 'wpsg'); ?></th>
+			<th class="wpsg_label" colspan="2"><?php echo __('Bezeichnung', 'wpsg'); ?></th>			
+			<th class="wpsg_show"><?php echo __('Anzeigen', 'wpsg'); ?></th>
+			<th class="wpsg_typ"><?php echo __('Typ', 'wpsg'); ?></th>		 
+			<th class="wpsg_action"></th>
 		</tr>
 	</thead>	
-	<?php foreach ($this->view['data'] as $pa) { ?>
-	<tbody id="pa_<?php echo $pa['id']; ?>">	
-		<tr class="wpsg_tablerow">
-			<td class="col_id wpsg_id"><?php echo $pa['id']; ?></td>
-			<td class="col_name" colspan="2"><span id="pa_<?php echo $pa['id']; ?>_name"><?php echo wpsg_hspc($pa['name']); ?></span></td>			
-			<td class="col_show">
+	<?php $i = 0; foreach ($this->view['data'] as $pa) { $i ++; ?>
+	<tbody id="pabody_<?php echo $pa['id']; ?>">	
+		<tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="pab_<?php echo $pa['id']; ?>">
+			<td class="wpsg_id"><?php echo $pa['id']; ?></td>
+			<td class="wpsg_label" colspan="2"><span id="pa_<?php echo $pa['id']; ?>_name"><?php echo wpsg_hspc($pa['name']); ?></span></td>			
+			<td class="wpsg_show">
 				<input title="<?php echo __('Werte direkt in jedem Template anzeigen wenn gesetzt.', 'wpsg'); ?>" id="show_<?php echo $pa['id']; ?>" <?php echo (($pa['autoshow'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />
 			</td>
-			<td class="col_typ">
-				<select id="typ_<?php echo $pa['id']; ?>" name="pa[<?php echo $pa['id']; ?>][typ]" onchange="wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);">
-					<option <?php echo (($pa['typ'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Textfeld', 'wpsg'); ?></option>
-					<option <?php echo (($pa['typ'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Textfeld (RTE)', 'wpsg'); ?></option>
-					<option <?php echo (($pa['typ'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Auswahlfeld', 'wpsg'); ?></option>
-					<option <?php echo (($pa['typ'] == '3')?'selected="selected"':''); ?> value="3"><?php echo __('Checkbox', 'wpsg'); ?></option>
-				</select>			
+			<td class="wpsg_typ">
+		   		<span id="wpsg_pa_typ_<?php echo $pa['id']; ?>"><?php echo $this->mod->arTypen[$pa['typ']]; ?></span>
 			</td>
-			<td class="col_action">
+			<td class="wpsg_action">
 				
 				<a class="wpsg-glyphlink-td" href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genPACode(<?php echo $pa['id']; ?>);">
@@ -41,10 +36,35 @@
 				</a>
 				
-				<a id="del_<?php echo $pa['id']; ?>" class="wpsg-glyphlink-td" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo wpsg_getStr($pv['id']); ?>);">
+				<a id="del_<?php echo $pa['id']; ?>" class="wpsg-glyphlink-td" href="#" title="<?php echo __('Produktattribut löschen', 'wpsg'); ?>" >
 					<span class="glyphicon glyphicon-trash"></span>
 				</a>
 				
 				<script type="text/javascript">/* <![CDATA[ */
-	
+
+								
+					jQuery('#wpsg_pa_typ_<?php echo $pa['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
+						submitdata: {
+							field: 'typ',
+							pa_id: '<?php echo $pa['id']; ?>'						
+						},
+						submit: '<?php echo __('Speichern', 'wpsg'); ?>',					
+						data: <?php echo wpsg_prepare_for_inlineEdit($this->mod->arTypen); ?>,
+						type: 'select',
+						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        callback: function(el) {
+                            if (el == '<?php echo __('Auswahl', 'wpsg'); ?>')
+                            {
+                                jQuery('#wpsg_pa_auswahlrow_<?php echo $pa['id']; ?>').show();
+                            }
+                            else
+                            {
+                                jQuery('#wpsg_pa_auswahlrow_<?php echo $pa['id']; ?>').hide();
+                            }
+                        }
+		                
+		            });
+					
 					jQuery('#del_<?php echo $pa['id']; ?>').bind('click', function() {
 	
@@ -99,32 +119,25 @@
 			</td>
 		</tr> 
-		<tr class="auswahlrow auswahlrow2 auswahlrow_<?php echo $pa['id']; ?>">
-			<td></td>
-			<td colspan="5">
-				<label><?php echo __('Auswahlmöglichkeiten ("|" als Trenner)', 'wpsg'); ?>:</label>&nbsp;				
-				<script type="text/javascript">/* <![CDATA[ */
-	
-					jQuery(document).ready(function() {
-						
-						jQuery('#pa_<?php echo $pa['id']; ?>_auswahl').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
-							submitdata: { 
-					    		field: 'auswahl',
-					    		pa_id: '<?php echo $pa['id']; ?>'
-							},
-							data: '<?php echo $pa['auswahl']; ?>',
-							submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-							placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-							indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-					    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-						});
-	
-						wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);
-						
-					} );
-				
-				/* ]]> */</script>			
-				<span id="pa_<?php echo $pa['id']; ?>_auswahl"><?php echo wpsg_hspc(((trim($pa['auswahl']) == '')?__('Bitte anklicken um Auswahl kommagetrennt zu definieren', 'wpsg'):$pa['auswahl'])); ?></span>
-			</td>
-		</tr>
+        <tr class="wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="wpsg_pa_auswahlrow_<?php echo $pa['id']; ?>" style="<?php echo (($pa['typ'] != '2')?'display:none;':''); ?>">
+            <td	class="wpsg_id"></td>
+            <td class="wpsg_select" colspan="4">
+                <?php echo __('Auswahl', 'wpsg'); ?>:
+                <span class="wpsg_editable" id="wpsg_pa_auswahl_<?php echo $pa['id']; ?>"><?php echo wpsg_hspc($pa['auswahl']); ?></span>
+                <script type="text/javascript">
+
+                    jQuery('#wpsg_pa_auswahl_<?php echo $pa['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {
+                        submitdata: {
+                            field: 'auswahl',
+                            pa_id: '<?php echo $pa['id']; ?>'
+                        },
+                        submit: '<?php echo __('Speichern', 'wpsg'); ?>',
+                        placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
+                        indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
+                        tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
+                    });
+
+                </script>
+            </td>
+        </tr>
 	</tbody> 
 	<?php } ?>	
@@ -137,7 +150,7 @@
 	jQuery(document).ready(function() {
 
-		jQuery('.wpsg_mod_produktattribute_table').sortable( {
+		jQuery('#wpsg_pa_table').sortable( {
 			helper: wpsg_Tablefix,
-			items: 'tbody',
+			items: 'tr.wpsg_tablerow',
 			handler: '.wpsg_id',
 			update: function(event, ui) {
@@ -158,5 +171,5 @@
 				
 			}
-		} ).disableSelection();
+		} );
 		
 	} );
Index: /views/mods/mod_produktattribute/settings_edit.phtml
===================================================================
--- /views/mods/mod_produktattribute/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_produktattribute/settings_edit.phtml	(revision 6005)
@@ -15,6 +15,11 @@
 	function wpsg_mod_produktattribute_changeTyp(pa_id)
 	{
-	
-		if (jQuery('#typ_' + pa_id).val() == '2')
+        //alert('changetyp1: ' + jQuery('#typ_' + pa_id).val());
+        //alert('changetyp1: ' + jQuery('#typ_' + pa_id).attr('data-value'));
+
+		//typ = jQuery('#typ_' + pa_id).val();
+		typ = jQuery('#typ_' + pa_id).attr('data-value');
+		
+		if (typ == '2')
 		{
 			jQuery('.auswahlrow_' + pa_id).show();
@@ -29,5 +34,5 @@
 			data: {
 				field: 'typ',
-				value: jQuery('#typ_' + pa_id).val(),
+				xvalue: jQuery('#typ_' + pa_id).attr('data-value'),
 				pa_id: pa_id
 			},
Index: /views/mods/mod_rechnungen/settings_edit.phtml
===================================================================
--- /views/mods/mod_rechnungen/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_rechnungen/settings_edit.phtml	(revision 6005)
@@ -87,4 +87,11 @@
 					<td>
 						<select name="text[<?php echo $f; ?>][fontsize]" style="width:100%;">
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "8")?'selected="selected"':''); ?> value="8">8</option>				
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "9")?'selected="selected"':''); ?> value="9">9</option>
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "10")?'selected="selected"':''); ?> value="10">10</option>
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "11")?'selected="selected"':''); ?> value="11">11</option>
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "12")?'selected="selected"':''); ?> value="12">12</option>
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "13")?'selected="selected"':''); ?> value="13">13</option>
+							<option <?php echo ((wpsg_getStr($this->view['arTexte'][$f]['fontsize']) == "14")?'selected="selected"':''); ?> value="14">14</option>
 						  
 						</select>
@@ -142,5 +149,5 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showpv', __('Produktvariablen auf Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showpv'), array('help' => 'wpsg_mod_rechnungen_showpv')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showov', __('Bestellvariablen auf Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showov'), array('help' => 'wpsg_mod_rechnungen_showov')); ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showanr', __('Artikelnummer auf Rechnung als Nr. verwenden', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showanr'), array('help' => 'wpsg_mod_rechnungen_showanr')); ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showanr', __('Artikelnummer auf Rechnung als Pos.-Nr. verwenden', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showanr'), array('help' => 'wpsg_mod_rechnungen_showanr')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_hideCountry', __('Land auf Lieferschein verbergen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_hideCountry'), array('help' => 'wpsg_mod_rechnungen_hideCountry')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_rechnungen_start', __('Startnummer (Rechnungen)', 'wpsg'), $this->get_option('wpsg_rechnungen_start'), array('help' => 'wpsg_rechnungen_start')); ?>
@@ -150,19 +157,14 @@
 			<?php echo wpsg_drawForm_Input('wpsg_gutschrift_format', __('Format (Rechnungskorrektur)', 'wpsg'), $this->get_option('wpsg_gutschrift_format'), array('help' => 'wpsg_gutschrift_format')); ?>
 			
-			<div class="wpsg_form_field">
-				<div class="wpsg_form_left">
-					<label><?php echo __('Mögliche Platzhalter fÌr Rechnungen und Rechnungskorrektur', 'wpsg'); ?>:</label>
-				</div>
-				<div class="wpsg_form_right">
-					<p>
-						%nr% - <?php echo __('Fortlaufende Rechnungs- bzw. Rechnungskorrekturnummer', 'wpsg'); ?><br />
-						%Jahr% - <?php echo __('Das aktuelle Jahr (4 Stellig)', 'wpsg'); ?><br />
-						%Monat% - <?php echo __('Der aktuelle Monat (01 - 12)', 'wpsg'); ?><br />
-						%Tag% - <?php echo __('Der Tag des Monats (01 - 31)', 'wpsg'); ?><br />						
-					</p>
-					<div class="wpsg_hinweis"><?php echo __('Die Platzhalter können bei den Formatfeldern und dem Dateinamen verwendet werden. Der Platzhalter %nr% sollte dabei immer Verwendung finden.', 'wpsg'); ?></div>					
-				</div>
-			</div>
-			<div class="wpsg_clear"></div>
+            <?php echo wpsg_drawForm_TextStart(); ?>
+				<p>
+					%nr% - <?php echo __('Fortlaufende Rechnungs- bzw. Rechnungskorrekturnummer', 'wpsg'); ?><br />
+					%Jahr% - <?php echo __('Das aktuelle Jahr (4 Stellig)', 'wpsg'); ?><br />
+					%Monat% - <?php echo __('Der aktuelle Monat (01 - 12)', 'wpsg'); ?><br />
+					%Tag% - <?php echo __('Der Tag des Monats (01 - 31)', 'wpsg'); ?><br />						
+				</p>
+				<div class="wpsg_hinweis"><?php echo __('Die Platzhalter können bei den Formatfeldern und dem Dateinamen verwendet werden. Der Platzhalter %nr% sollte dabei immer Verwendung finden.', 'wpsg'); ?></div>					
+		
+            <?php echo wpsg_drawForm_TextEnd(__('Mögliche Platzhalter fÌr Rechnungen und Rechnungskorrektur', 'wpsg'), array('noP' => true)); ?>
 		
 		</div>
Index: /views/mods/mod_statistics/settings_edit.phtml
===================================================================
--- /views/mods/mod_statistics/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_statistics/settings_edit.phtml	(revision 6005)
@@ -90,5 +90,9 @@
 			<h3><?php echo __('Zieleinrichtung in Google Analytics', 'wpsg'); ?></h3>
 			
-			<?php echo __('Ziel', 'wpsg'); ?>&nbsp;:
+			<?php 
+			echo wpsg_drawForm_Textstart();
+			echo wpsg_drawForm_TextEnd(__('Ziel', 'wpsg'), array('noP' => true));
+			?>
+			
 			<ul>
 				<li>
@@ -100,5 +104,9 @@
 				</li>
 			</ul>
-			<?php echo __('Trichter (optional)', 'wpsg'); ?>:
+			<?php 
+			echo wpsg_drawForm_Textstart();
+			echo wpsg_drawForm_TextEnd(__('Trichter (optional)', 'wpsg'), array('noP' => true));
+			?>
+
 			<ul>
 			
Index: /views/mods/mod_trustedshops/settings_edit.phtml
===================================================================
--- /views/mods/mod_trustedshops/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_trustedshops/settings_edit.phtml	(revision 6005)
@@ -18,16 +18,13 @@
 <div class="wpsg_mod_protectedshops">
 	<div class="wpsg_admin_box" id="wpsg_tab">	
-		<div class="head">
-			<div class="title">
-				<div class="tab" id="tab1"><?php echo __('Trusted Shops Widget', 'wpsg'); ?></div>
-				<div class="tab" id="tab2"><?php echo __('Bestellabschluss', 'wpsg'); ?></div>
-				<div class="tab" id="tab3"><?php echo __('Bewertungslinks', 'wpsg'); ?></div>
-				<div class="tab" id="tab4"><?php echo __('Review Collector', 'wpsg'); ?></div>
-				<div class="wpsg_clear"></div>		
-			</div>
-		</div>
-		<div class="content">
-			
-			<div id="tabcontent1" class="tabcontent">
+
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Trusted Shops Widget', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Bestellabschluss', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab3" aria-controls="messages" role="tab" data-toggle="tab"><?php echo __('Bewertungslinks', 'wpsg'); ?></a></li>
+        <li role="presentation"><a href="#tab4" aria-controls="messages" role="tab" data-toggle="tab"><?php echo __('Review Collector', 'wpsg'); ?></a></li>
+    </ul>
+	<div class="tab-content">
+		<div id="tab1" role="tabpanel" class="tab-pane active" >
 	
 				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_trustedshops_siegelcache', __('Bewertungsbild zwischenspeichern (empfohlen)', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_siegelcache'), array('help' => 'wpsg_mod_trustedshops_siegelcache')); ?>
@@ -41,7 +38,7 @@
 				<?php } ?>
 						
-			</div>
+		</div>
 			
-			<div id="tabcontent2" class="tabcontent">
+		<div id="tab2" role="tabpanel" class="tab-pane" >
 						
 				<?php echo wpsg_drawForm_Select('wpsg_mod_trustedshops_orderdone', __('Link zur Bewertung', 'wpsg'), array(
@@ -57,7 +54,7 @@
 				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_trustedshops_warranty', __('Trusted Shops KÀuferschutz (Garantie)', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_warranty'), array('help' => 'wpsg_mod_trustedshops_warranty')); ?>
 	 								 
-			</div>
+		</div>
 			
-			<div id="tabcontent3" class="tabcontent">
+		<div id="tab3" role="tabpanel" class="tab-pane" >
 			
 				<?php echo wpsg_drawForm_Select('wpsg_mod_trustedshops_customermail', __('Link zur Bewertung in Kundenmail nach Bestellabschluss', 'wpsg'), array(
@@ -82,14 +79,9 @@
 				<?php } ?>
 						
-			</div>
+		</div>
 			
-			<div id="tabcontent4" class="tabcontent">
-			
-				<div class="wpsg_form_field">
-					<div class="wpsg_form_left">
-						<label for="wpsg_mod_trustedshops_reminder"><?php echo __('Erinnerung', 'wpsg'); ?>:</label>
-					</div>
-					<div class="wpsg_form_right">
-					
+		<div id="tab4" role="tabpanel" class="tab-pane" >
+
+            <?php echo wpsg_drawForm_TextStart(); ?>
 						<input type="hidden" name="wpsg_mod_trustedshops_reminder" value="0">
 						<input id="wpsg_mod_trustedshops_reminder" type="checkbox" class="checkbox" <?php echo ((wpsg_isSizedInt($this->get_option('wpsg_mod_trustedshops_reminder')))?'checked="checked"':''); ?> tabindex="14" name="wpsg_mod_trustedshops_reminder" value="1">
@@ -102,25 +94,25 @@
 						
 						</div>
-					
-					</div>
-					<div class="wpsg_clear"></div>
-				</div>
+						
+            <?php echo wpsg_drawForm_TextEnd(__('Erinnerung', 'wpsg'), array('noP' => true)); ?>
+			
+            <?php echo wpsg_drawForm_TextStart(); ?>
+					<?php foreach ($this->arStatus as $state_id => $state_label) { ?>
+					<?php
+					$arr1 = $this->get_option('wpsg_mod_trustedshops_state');
+					$chk = ((in_array($state_id, (array)$this->get_option('wpsg_mod_trustedshops_state')))?1:0);
+					echo wpsg_drawForm_Checkbox('wpsg_mod_trustedshops_state[]', __($state_label, 'wpsg'),
+					$chk, array('help1' => 'wpsg_shippay_mwstland',
+								'value' => wpsg_hspc($state_id),
+								'noHidden' => true,
+								'fullWidth' => true
+					));
+					?>
+					<br />
+					<?php } ?>
+
+            <?php echo wpsg_drawForm_TextEnd(__('BestellzustÀnde', 'wpsg'), array('noP' => true)); ?>
+
 				
-				<div class="wpsg_form_field">
-					<div class="wpsg_form_left">
-						<label for="wpsg_mod_trustedshops_reminder"><?php echo __('BestellzustÀnde', 'wpsg'); ?>:</label>
-					</div>
-					<div class="wpsg_form_right">
-					
-						<?php foreach ($this->arStatus as $state_id => $state_label) { ?>
-						<label>
-							<input type="checkbox" class="checkbox" name="wpsg_mod_trustedshops_state[]" <?php echo ((in_array($state_id, (array)$this->get_option('wpsg_mod_trustedshops_state')))?'checked="checked"':''); ?> value="<?php echo $state_id; ?>" />
-							<?php echo $state_label; ?><br />
-						</label>
-						<?php } ?>
-											
-					</div>
-					<div class="wpsg_clear"></div>
-				</div>
 				 				
 				<?php echo wpsg_drawForm_Input('', __('Letzter Export', 'wpsg'), $this->view['lastExport'], array('text' => true)); ?>
@@ -145,7 +137,6 @@
 				<a href="https://www.trustedshops.com/tsb2b/sa/ratings/batchRatingRequest.seam"><?php echo __('Trusted Shops Review Collector', 'wpsg'); ?></a>				
 				
-			</div>
+		</div>
 			
-		</div>
 	</div>
 </div>
Index: /views/mods/mod_voucherproduct/settings_edit.phtml
===================================================================
--- /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6005)
@@ -48,5 +48,6 @@
 		
 		<div role="tabpanel" class="tab-pane" id="tab2" >
-			<table class="wpsg_mod_voucher_fieldtable">
+			<table class="table table-body-striped wpsg_mod_voucher_fieldtable">
+				<thead>
 				<tr>
 					<th class="col_bezeichnung"></th>					
@@ -61,4 +62,6 @@
 					<th class="col_action"></th>
 				</tr>
+				</thead>
+				<tbody>
 				<?php for ($i = 0; $i < 10; $i ++) { ?>
 				<tr>
@@ -125,4 +128,5 @@
 				</tr>
 				<?php } ?>
+				</tbody>
 			</table>
 			
Index: /views/mods/mod_wirecard/settings_edit.phtml
===================================================================
--- /views/mods/mod_wirecard/settings_edit.phtml	(revision 6004)
+++ /views/mods/mod_wirecard/settings_edit.phtml	(revision 6005)
@@ -7,5 +7,5 @@
 ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_wirecard_name'), array('help' => 'wpsg_shippay_name')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_activ', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_wirecard_activ'), array('help' => 'wpsg_shippay_activ')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_activ', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_wirecard_activ'), array('rAlign' => true, 'help' => 'wpsg_shippay_activ')); ?>
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_wirecard_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_wirecard_hint'), array('help' => 'wpsg_shippay_hint')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_logo', __('Logo URL', 'wpsg'), $this->get_option('wpsg_mod_wirecard_logo'), array('help' => 'wpsg_mod_wirecard_logo', 'hint' => __('Auflösung: 95x65 Pixel (GIF/JPG/PNG)', 'wpsg'))); ?>
@@ -29,16 +29,35 @@
 <div class="wpsg_form_field">
 	<div class="wpsg_form_left">
-		<label for="wpsg_mod_wirecard_paymenttype"><?php echo __('VerfÃŒgbare Zahlungsarten', 'wpsg'); ?>:</label>	
+		
 	</div>
-	<div class="wpsg_form_right"> 
+	<div class="wpsg_form_right1"> 
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <?php echo wpsg_drawForm_TextEnd(__('VerfÃŒgbare Zahlungsarten', 'wpsg'), array('noP' => true)); ?>
 		<ul class="wpsg_mod_wirecard_paymenttypeselect">
 			<?php foreach ($this->view['paymentTypes'] as $pt_key => $pt) { ?>
 		 	<li>
-		 		<input type="hidden" name="wpsg_mod_wirecard_paymentorder[]" value="<?php echo wpsg_hspc($pt_key); ?>" />
-		 		<input type="checkbox" value="<?php echo wpsg_hspc($pt_key); ?>" <?php echo ((in_array($pt_key, (array)explode(',', $this->get_option('wpsg_mod_wirecard_paymenttype'))))?'checked="checked"':''); ?> name="wpsg_mod_wirecard_paymenttype[]" />&nbsp;<?php echo wpsg_hspc($pt); ?>
+	 		<input type="hidden" name="wpsg_mod_wirecard_paymentorder[]" value="<?php echo wpsg_hspc($pt_key); ?>" />
+			<?php 
+			$arr1 = $this->get_option('wpsg_mod_wirecard_paymenttype');
+			$arr2 = (array)explode(',', $this->get_option('wpsg_mod_wirecard_paymenttype'));
+			$chk = ((in_array($pt_key, (array)explode(',', $this->get_option('wpsg_mod_wirecard_paymenttype'))))?'checked="checked"':'');
+			$chk = ((in_array($pt_key, (array)explode(',', $this->get_option('wpsg_mod_wirecard_paymenttype'))))?1:0);
+			// function wpsg_drawForm_Checkbox($field_name, $field_label, $field_checked, $conf = array())
+			echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_paymenttype[]', __($pt, 'wpsg'),
+					$chk, array('help1' => 'wpsg_shippay_mwstland',
+							    'value' => wpsg_hspc($pt_key),
+							    'noHidden' => true,
+								'fullWidth1' => true
+			));
+			?>
+		
 		 	</li>
 			<?php } ?>
 		</ul> 
+		<?php echo wpsg_drawForm_TextStart(); ?>
 		<p class="wpsg_hinweis"><?php echo __('Reihenfolge kann mittels Drag&Drop verÀndert werden.', 'wpsg'); ?></p>
+        <?php echo wpsg_drawForm_TextEnd(__('', 'wpsg'), array('noP' => true)); ?>
+		<br />
+		
 	</div>
 	<div class="wpsg_clear"></div>
Index: /views/order/index.phtml
===================================================================
--- /views/order/index.phtml	(revision 6004)
+++ /views/order/index.phtml	(revision 6005)
@@ -167,9 +167,9 @@
 
                             <?php if (trim($oOrder->admincomment) != "") { ?>
-                            <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"></a>
+                            <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>
                             <?php } ?>
 
                             <?php if (trim($oOrder->comment) != "") { ?>
-                            <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"></a>
+                            <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"></a>
                             <?php } ?>