Index: /mods/wpsg_mod_fuellmenge.class.php
===================================================================
--- /mods/wpsg_mod_fuellmenge.class.php	(revision 6498)
+++ /mods/wpsg_mod_fuellmenge.class.php	(revision 6499)
@@ -87,9 +87,13 @@
 			$product_data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit'));
 		
-			/*$product_content['wpsg_mod_fuellmenge'] = array(
-					'title' => __('FÃŒllmenge', 'wpsg'),
-					'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false)
-			);*/
 			
+			if (!array_key_exists('stock', $product_content))
+			{
+				$product_content['wpsg_mod_fuellmenge'] = array(
+						'title' => __('Bestand / Maße', 'wpsg'),
+						'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false)
+				);
+			}
+				
 			$product_content['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/produkt_edit_sidebar.phtml', false);
 		
Index: /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml	(revision 6498)
+++ /views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml	(revision 6499)
@@ -2,5 +2,5 @@
 
 	/**
-	 * Template fÃŒr den Adminbereich des FÃŒllmengenmoduls innerhalb des Produktes
+	 * Template fÃŒr die Konfiguration der FÃŒllmenge innerhalb der Produktverwaltung
 	 */
 
@@ -13,15 +13,7 @@
 	</div>
 	<div class="panel-body">
+		<?php echo wpsg_drawForm_Input('fmenge', __('FÃŒllmenge', 'wpsg'), wpsg_tf(wpsg_getFloat($this->view['data']['fmenge']))); ?>
 		<?php echo wpsg_drawForm_Select('feinheit', __('Einheit', 'wpsg'), $this->view['data']['arFeinheiten'], wpsg_getStr($this->view['data']['feinheit'])); ?>
-		<?php echo wpsg_drawForm_Input('fmenge', __('FÃŒllmenge', 'wpsg'), wpsg_tf(wpsg_getFloat($this->view['data']['fmenge']))); ?>
 		
-	<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_einheit', __('Mögliche Einheiten (Kommagetrennt)', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?>
-	<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_bezug', __('Bezugsgröße', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?>
-	<?php if ($this->hasMod('wpsg_mod_productindex')) { ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_fmenge', __('FÃŒllmenge auf ProduktÃŒbersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_grundpreis', __('Grundpreis auf ProduktÃŒbersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?>
-	<?php } ?>
-	
 	<br /><br />
 	
Index: /views/mods/mod_voucherproduct/settings_edit.phtml
===================================================================
--- /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6498)
+++ /views/mods/mod_voucherproduct/settings_edit.phtml	(revision 6499)
@@ -53,14 +53,15 @@
 				<thead>
 				<tr>
-					<th class="col_bezeichnung"></th>					
+					<th class="col_bezeichnung"></th>		
+					<th class="col_freitext_label"><?php echo __('Freitext', 'wpsg'); ?></th>			
 					<th class="col_x"><?php echo __('X', 'wpsg'); ?></th>
 					<th class="col_y"><?php echo __('Y', 'wpsg'); ?></th>
+					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
+					<th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>
 					<th class="col_align"><?php echo __('Zentriert', 'wpsg'); ?></th>
-					<th class="col_bg"><?php echo __('Hintergrund', 'wpsg'); ?></th>
-					<th class="col_color"><?php echo __('Farbe', 'wpsg'); ?></th>
+					<th class="col_bg"><?php echo __('Hintergrund', 'wpsg'); ?></th>					
 					<th class="col_alpha"><?php echo __('Deckkraft', 'wpsg'); ?></th>
 					<th class="col_angle"><?php echo __('Winkel', 'wpsg'); ?></th>
-					<th class="col_groesse"><?php echo __('Größe', 'wpsg'); ?></th>
-					<th class="col_action"></th>
+					<th class="col_action"><?php echo __('Aktiv', 'wpsg'); ?></th>
 				</tr>
 				</thead>
@@ -68,5 +69,8 @@
 				<?php for ($i = 0; $i < 10; $i ++) { ?>
 				<tr>
-					<td><?php echo '#'.($i + 1); ?></td>					
+					<td><?php echo '#'.($i + 1); ?></td>			
+					<td>
+						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][text]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['text'])); ?>" />
+					</td>		
 					<td>
 						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][x]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['x'])); ?>" />
@@ -75,20 +79,6 @@
 						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][y]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['y'])); ?>" />
 					</td>
-					<td class="col_align">
-						<input type="hidden" name="text[<?php echo $i; ?>][align]" value="0" />
-						<input type="checkbox" name="text[<?php echo $i; ?>][align]" value="1" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['align']))?'checked="checked"':''); ?> />
-					</td>
-					<td class="col_bg">
-						<input type="hidden" name="text[<?php echo $i; ?>][bg]" value="0" />
-						<input type="checkbox" name="text[<?php echo $i; ?>][bg]" value="1" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['bg']))?'checked="checked"':''); ?> />
-					</td>
 					<td>
 						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][color]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['color'])); ?>" />
-					</td>
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][alpha]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['alpha'])); ?>" />
-					</td>					
-					<td>
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][angle]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['angle'])); ?>" />
 					</td>
 					<td>
@@ -117,14 +107,23 @@
 						</select>
 					</td>
+					<td class="col_align">
+						<input type="hidden" name="text[<?php echo $i; ?>][align]" value="0" />
+						<input type="checkbox" name="text[<?php echo $i; ?>][align]" value="1" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['align']))?'checked="checked"':''); ?> />
+					</td>
+					<td class="col_bg">
+						<input type="hidden" name="text[<?php echo $i; ?>][bg]" value="0" />
+						<input type="checkbox" name="text[<?php echo $i; ?>][bg]" value="1" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['bg']))?'checked="checked"':''); ?> />
+					</td>
+
+					<td>
+						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][alpha]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['alpha'])); ?>" />
+					</td>					
+					<td>
+						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][angle]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['angle'])); ?>" />
+					</td>
+					
 					<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>
+						<input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['aktiv']))?'checked="checked"':''); ?> />
 						<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>
-				<tr>
-					<td></td>
-					<td class="col_freitext_label"><?php echo __('Freitext', 'wpsg'); ?>:</td>
-					<td colspan="8" class="col_freitext">
-						<input type="text" style="width:100%;" name="text[<?php echo $i; ?>][text]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['arTexte'][$i]['text'])); ?>" />
 					</td>
 				</tr>