Index: /mods/wpsg_mod_customergroup.class.php
===================================================================
--- /mods/wpsg_mod_customergroup.class.php	(revision 6008)
+++ /mods/wpsg_mod_customergroup.class.php	(revision 6009)
@@ -27,4 +27,5 @@
 			$this->desc = __('Ist dieses Modul aktiv, so lassen sich die Kunden in Kundengruppen verwalten. Mit den entsprechenden Modul "Rabatt" ist es möglich einen Rabatt je Kundengruppe zu definieren.', 'wpsg');
 						
+			$this->customerGroupPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_group_perpage');
 		} // public function __construct()		
 		 
@@ -87,4 +88,5 @@
 		{
 			
+			$this->shop->update_option('wpsg_mod_kundenverwaltung_group_perpage', $_REQUEST['wpsg_mod_kundenverwaltung_group_perpage']);
 			$this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_checkout', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_checkout']);
 			$this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_register', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_register']);
Index: /views/mods/mod_customergroup/index.phtml
===================================================================
--- /views/mods/mod_customergroup/index.phtml	(revision 6008)
+++ /views/mods/mod_customergroup/index.phtml	(revision 6009)
@@ -48,5 +48,5 @@
     </nav>
 
-    <?php if ($this->view['pages'] > 1) { ?>
+    <?php if ($this->view['pages'] > $this->get_option('wpsg_mod_kundenverwaltung_group_perpage')) { ?>
         <nav class="pagination_wrap">
             <ul class="pagination">
@@ -110,5 +110,5 @@
             </table>
 
-            <?php if ($this->view['pages'] > 1) { ?>
+            <?php if ($this->view['pages'] > $this->get_option('wpsg_mod_kundenverwaltung_group_perpage')) { ?>
                 <nav class="pagination_wrap pagination_wrap_bottom">
                     <ul class="pagination">
Index: /views/mods/mod_customergroup/settings_edit.phtml
===================================================================
--- /views/mods/mod_customergroup/settings_edit.phtml	(revision 6008)
+++ /views/mods/mod_customergroup/settings_edit.phtml	(revision 6009)
@@ -6,4 +6,6 @@
 
 ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_kundenverwaltung_group_perpage', __('Kundengruppen pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_group_perpage'), array('help' => 'wpsg_mod_kundenverwaltung_group_perpage')); ?>
+
 <?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_group_checkout', __('Kundengruppe bei Registrierung (Checkout)', 'wpsg'), $this->view['arCustomergroup'], $this->get_option('wpsg_page_mod_kundenverwaltung_group_checkout'), array('help' => 'wpsg_page_mod_kundenverwaltung_group_checkout')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_group_register', __('Kundengruppe bei Registrierung (Registrierung)', 'wpsg'), $this->view['arCustomergroup'], $this->get_option('wpsg_page_mod_kundenverwaltung_group_register'), array('help' => 'wpsg_page_mod_kundenverwaltung_group_register')); ?>
Index: /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
===================================================================
--- /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 6008)
+++ /views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml	(revision 6009)
@@ -10,10 +10,10 @@
 
 	<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true)); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_select')); ?>
 	<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
-		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['deliverytime'], array('unit' => __('Tage', 'wpsg'))); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), wpsg_getStr($this->view['wpsg_mod_deliverytime']['deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?>
 	<?php } ?>
 	<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']);?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
 	<?php } ?>
 	
Index: /views/mods/mod_discount/customergroup_edit.phtml
===================================================================
--- /views/mods/mod_discount/customergroup_edit.phtml	(revision 6008)
+++ /views/mods/mod_discount/customergroup_edit.phtml	(revision 6009)
@@ -6,11 +6,6 @@
 
 ?>
-<div id="wpsg_customerpasswd" class="postbox">
-	<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-	<h3 class="wpsg_handlediv">
-		<span><?php echo __('Kundengruppenrabatt', 'wpsg'); ?></span>
-	</h3>
-	<div class="inside">
-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['discount'])); ?>
-	</div>
+<div id="wpsg_customerpasswd" >
+	<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount]', __('Rabatt', 'wpsg'), wpsg_ff($this->view['wpsg_mod_discount']['discount'])); ?>
+
 </div>