Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6314)
+++ /controller/wpsg_ShopController.class.php	(revision 6315)
@@ -173,5 +173,5 @@
 			// Seitentitel auf Produktseiten nicht anzeigen
 			if ($this->hasMod('wpsg_mod_produktartikel') && get_post_type() === $this->get_option('wpsg_mod_produktartikel_pathkey')) $this->titleDisplayed = true;
-			
+						
 			return $title;
 			
@@ -1214,5 +1214,5 @@
 			
 			if (wpsg_isSizedString($this->view['data']['product_key'])) $this->view['oProduct']->setProductKey($this->view['data']['product_key']);
-			
+									
 			$html  = '';
 			$html .= '<form class="wpsg_productform" id="wpsg_produktform_'.$GLOBALS['wpsg_produkt_index'].'" method="post" action="'.$myReferer.'">';		
@@ -1242,4 +1242,6 @@
 			}
 			
+			$this->titleDisplayed = false;
+			
 			return $html;
 			
@@ -1317,9 +1319,9 @@
 					
 				}
-				
+				 
 				if ($atts['product'] === '-1')
 				{
-						
-					$arProductIDs = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` ORDER BY `id` ASC ");		
+											
+					$arProductIDs = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` <= 0 ORDER BY `id` ASC ");		
 					$content = '';
 					
@@ -1327,4 +1329,7 @@
 					{
 						
+						if (isset($atts['hide_title']) && $atts['hide_title'] === '1') $this->titleDisplayed = true;
+						else $this->titleDisplayed = false;
+						
 						$content .= $this->renderProdukt($product_id, $template);
 						
@@ -1336,5 +1341,8 @@
 				else
 				{
-				
+					
+					if (isset($atts['hide_title']) && $atts['hide_title'] === '1') $this->titleDisplayed = true;
+					else $this->titleDisplayed = false;
+				 
 					return $this->renderProdukt($atts['product'], $template);
 						
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css	(revision 6314)
+++ /views/css/frontend.css	(revision 6315)
@@ -170,4 +170,5 @@
 .wpsg_basket_widget table .wpsg_cell_amount { text-align:right; padding-right:0.2rem; }
 .wpsg_basket_widget table .wpsg_row_summary .wpsg_cell_amount { font-weight:bold; }
+.wpsg_basket_widget .wpsg_tax_note { font-size:0.75em; }
 
 /* Modul Kundenverwaltung */
Index: /views/js/mce_plugin.js
===================================================================
--- /views/js/mce_plugin.js	(revision 6314)
+++ /views/js/mce_plugin.js	(revision 6315)
@@ -28,5 +28,7 @@
  
 		createControl : function(n, cm) {
+			
 			return null;
+			
 		},
  
@@ -39,4 +41,5 @@
 			};
 		}
+		
 	});
 
Index: /views/produkt/select.phtml
===================================================================
--- /views/produkt/select.phtml	(revision 6314)
+++ /views/produkt/select.phtml	(revision 6315)
@@ -57,4 +57,11 @@
 					text += " template=\"" + document.getElementById("template").options[document.getElementById("template").selectedIndex].text + "\"";
 				
+				}
+				
+				if (document.getElementById("title") != null && document.getElementById("title").value != "1")
+				{
+					
+					text += " hide_title=\"1\" ";
+					
 				}
 				
@@ -147,5 +154,11 @@
 					
 					<?php echo wpsg_drawForm_Select('produkt', __('Produkt', 'wpsg'), $this->view['arProdukte'], false); ?>
-					<?php echo wpsg_drawForm_Select('template', __('Template', 'wpsg'), $this->view['arTemplates'], false); ?>
+					
+					<div class="col-xs-6">
+						<div class="row"><?php echo wpsg_drawForm_Select('template', __('Template', 'wpsg'), $this->view['arTemplates'], false); ?></div>
+					</div>
+					<div class="col-xs-6">
+						<div class="row"><?php echo wpsg_drawForm_Select('title', __('Titel anzeigen', 'wpsg'), array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg')), '1'); ?></div>
+					</div>
 					
 					<?php if ($_REQUEST['wpsg_mode'] != 'wpsg_mod_relatedproducts') { ?>				
Index: /views/warenkorb/index.phtml
===================================================================
--- /views/warenkorb/index.phtml	(revision 6314)
+++ /views/warenkorb/index.phtml	(revision 6315)
@@ -68,14 +68,16 @@
 			</tr>
 		</table>
-	</form>
-	<br />
+	</form> 
 		
-	<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
-	<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
-	<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
-	<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
-	<?php } else { ?>
-	<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
-	<?php } ?>
+	<span class="wpsg_tax_note">
+		<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
+		<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
+		<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
+		<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
+		<?php } else { ?>
+		<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
+		<?php } ?>
+	</span>
+		
 	<?php if ($this->get_option('wpsg_page_basket') != get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
 	<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
