Index: /mods/wpsg_mod_fuellmenge.class.php
===================================================================
--- /mods/wpsg_mod_fuellmenge.class.php	(revision 7159)
+++ /mods/wpsg_mod_fuellmenge.class.php	(revision 7160)
@@ -88,9 +88,6 @@
 			
 			if ($this->shop->get_option('wpsg_mod_fuellmenge_showBasketProduct') != '1') return;
-			
-			$this->shop->view['fuellmenge'] =$p['fuellmenge']; 
-			
-			$this->shop->view['fuellmenge'] = $p ['fuellmenge']; 
-			
+						
+			$this->shop->view['p'] = $p;
 			$this->shop->view['i'] = $i; 
 			
@@ -115,5 +112,6 @@
 			
 			$this->shop->view['i'] = $i; 
-			$this->shop->view['fuellmenge'] = $p['fuellmenge']; 
+			$this->shop->view['p'] = $p; 
+			
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_fuellmenge/overview_row.phtml');
 			
@@ -294,5 +292,5 @@
         }
 		
-		public function renderPriceInfo($price, $fmenge, $feinheit)
+		public function renderPriceInfo($price, $fmenge, $feinheit, $layout = 0)
 		{
 			
@@ -308,4 +306,5 @@
 			
 			$this->shop->view['wpsg_mod_fuellmenge'] = array(
+			    'layout' => $layout,
 				'fmenge' => $fmenge,
 				'feinheit' => $feinheit,
Index: /views/mods/mod_fuellmenge/basket_row.phtml
===================================================================
--- /views/mods/mod_fuellmenge/basket_row.phtml	(revision 7159)
+++ /views/mods/mod_fuellmenge/basket_row.phtml	(revision 7160)
@@ -4,30 +4,16 @@
 	 * Template fÃŒr die Anzeige der FÃŒllmenge im Warenkorb
 	 */
-	//wpsg_debug($this->view);
+	 
 ?>
 <div class="product_info">
-	<div 
-		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+	
+    <div>
 		
-		<?php /* if (($this->view['data']['fmenge']) > '0') { */ ?>
-		
-			<span class="fa  fa-balance-scale"></span>
-				
-			<span class="label label_fuellmenge"><?php echo wpsg_translate(__('FÃŒllmenge:', 'wpsg')); ?></span>
-						
-			<?php echo wpsg_translate(__('#1# (#2# / #3#)', 'wpsg'),							
-				'<span class="wpsg_fmenge">'.wpsg_ff($this->view['data']['fmenge'], '', true).'</span> '.$this->view['data']['feinheit'],
-				'<span class="fmenge_preis">'.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).'</span> ',
-				wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
-			); ?>
-
-			<?php /* ?>
-			
-		<?php  } else { ?>
-				
-			<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>
-					
-		<?php }  */?>
+        <span class="fa  fa-balance-scale"></span>
+            
+        <?php echo wpsg_translate(__('FÃŒllmenge:', 'wpsg')); ?>
+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>            
+        
 	</div>
-	<br />
+        
 </div>
Index: /views/mods/mod_fuellmenge/overview_row.phtml
===================================================================
--- /views/mods/mod_fuellmenge/overview_row.phtml	(revision 7159)
+++ /views/mods/mod_fuellmenge/overview_row.phtml	(revision 7160)
@@ -7,10 +7,13 @@
 ?>
 <div class="product_info">
-	<div 
-		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
-		<span class="fa  fa-balance-scale"></span>
-		<?php echo __("FÃŒllmenge", "wpsg"); ?>:
-		<strong><?php echo wpsg_ff($this->view['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?></strong>
-	</div>
-	<br />
+
+    <div>
+
+        <span class="fa  fa-balance-scale"></span>
+
+        <?php echo wpsg_translate(__('FÃŒllmenge:', 'wpsg')); ?>
+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>
+
+    </div>
+
 </div>
Index: /views/mods/mod_fuellmenge/priceinfo.phtml
===================================================================
--- /views/mods/mod_fuellmenge/priceinfo.phtml	(revision 7159)
+++ /views/mods/mod_fuellmenge/priceinfo.phtml	(revision 7160)
@@ -5,7 +5,22 @@
 	 */
 
-?><div class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(
-	__('(#1# / #2#)', 'wpsg'),
-	wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),
-	wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])
-); ?></div>
+?>
+
+<?php if ($this->view['wpsg_mod_fuellmenge']['layout'] === 1) { ?>
+
+    <span class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(
+        __('#1# (#2# / #3#)', 'wpsg'),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge'], $this->view['wpsg_mod_fuellmenge']['feinheit']),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),
+        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])
+    ); ?></span>
+    
+<?php } else { ?>
+
+    <div class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(
+        __('(#1# / #2#)', 'wpsg'),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),
+        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])
+    ); ?></div>
+
+<?php } ?>
Index: /views/mods/mod_produktattribute/basket_row.phtml
===================================================================
--- /views/mods/mod_produktattribute/basket_row.phtml	(revision 7159)
+++ /views/mods/mod_produktattribute/basket_row.phtml	(revision 7160)
@@ -14,6 +14,5 @@
 		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>:
 		<strong><?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?></strong>
-	</div>
-	<br />
+	</div> 
 </div>
 <?php }?>
Index: /views/mods/mod_produktattribute/overview_row.phtml
===================================================================
--- /views/mods/mod_produktattribute/overview_row.phtml	(revision 7159)
+++ /views/mods/mod_produktattribute/overview_row.phtml	(revision 7160)
@@ -15,6 +15,4 @@
 		<strong><?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?></strong>
 	</div>
-	<br />
-
 </div>
 <?php }?>
Index: /views/mods/mod_weight/basket_row.phtml
===================================================================
--- /views/mods/mod_weight/basket_row.phtml	(revision 7159)
+++ /views/mods/mod_weight/basket_row.phtml	(revision 7160)
@@ -12,5 +12,4 @@
 		<?php echo __("Gewicht", "wpsg"); ?>:
 		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>
-	</div>
-	<br />
+	</div> 
 </div>
Index: /views/mods/mod_weight/overview_row.phtml
===================================================================
--- /views/mods/mod_weight/overview_row.phtml	(revision 7159)
+++ /views/mods/mod_weight/overview_row.phtml	(revision 7160)
@@ -12,5 +12,4 @@
 		<?php echo __("Gewicht", "wpsg"); ?>:
 		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>
-	</div>
-	<br />
+	</div> 
 </div>