Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 5746)
+++ /controller/wpsg_AdminController.class.php	(revision 5748)
@@ -812,6 +812,6 @@
 
 				$this->addBackendMessage(__('Die markierten LÀnder wurden erfolgreich gelöscht.', 'wpsg'));
-
 				$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender');
+
 			}
 			
@@ -824,5 +824,6 @@
 				{
 
-					$this->db->UpdateQuery(WPSG_TBL_LAND, wpsg_q($form_data), " `id` = '".wpsg_q($form_data['id'])."' ");
+					$this->db->UpdateQuery(WPSG_TBL_LAND, wpsg_q($form_data['country']), " `id` = '".wpsg_q($form_data['id'])."' ");
+					$this->addBackendMessage(__('Land erfolgreich gespeichert.', 'wpsg'));
 
 				}
@@ -830,10 +831,12 @@
 				{
 
-					$this->db->ImportQuery(WPSG_TBL_LAND, wpsg_q($form_data));
-
-				}
-
-				wpsg_debug($form_data);
-				die(wpsg_debug($_REQUEST));
+					$form_data['id'] = $this->db->ImportQuery(WPSG_TBL_LAND, wpsg_q($form_data['country']));
+					$this->addBackendMessage(__('Land erfolgreich angelegt.', 'wpsg'));
+
+				}
+
+				if (wpsg_isSizedInt($form_data['standard'])) $this->update_option('wpsg_defaultland', $form_data['id']);
+
+				die($this->laenderList());
 				
 			}
@@ -844,6 +847,6 @@
 				$this->loadEULaender();
 				$this->shop->addBackendMessage(__('EU-LÀnder erfolgreich importiert.', 'wpsg'));
-				
-				$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender');
+
+				die($this->laenderList());
 				
 			}
@@ -853,6 +856,6 @@
 				$this->loadStandardLaenderVz();
 				$this->shop->addBackendMessage(__('LÀnder erfolgreich importiert.', 'wpsg'));
-				
-				$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender');				
+
+				die($this->laenderList());
 				
 			}
@@ -886,5 +889,5 @@
 				$this->shop->view['vz'] = $this->db->fetchAssocField("SELECT `id`, `name` FROM `".WPSG_TBL_VZ."` ORDER BY `name` ASC", "id", "name");
 				$this->shop->view['land'] = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($_REQUEST['land_id'])."' ");
-				
+
 				if (wpsg_tf($this->shop->view['land']['mwst_a']) >= 0 && wpsg_tf($this->shop->view['land']['mwst_a']) !== '') $this->shop->view['land']['mwst_a'] = wpsg_ff(wpsg_tf($this->shop->view['land']['mwst_a']), '%'); else $this->shop->view['land']['mwst_a'] = ''; 
 				if (wpsg_tf($this->shop->view['land']['mwst_b']) >= 0 && wpsg_tf($this->shop->view['land']['mwst_b']) !== '') $this->shop->view['land']['mwst_b'] = wpsg_ff(wpsg_tf($this->shop->view['land']['mwst_b']), '%'); else $this->shop->view['land']['mwst_b'] = '';
@@ -904,5 +907,15 @@
 					 	
 		} // public function laenderAction()
-		
+
+		private function laenderList()
+		{
+
+			$this->shop->view['vz'] = $this->db->fetchAssocField("SELECT `id`, `name` FROM `".WPSG_TBL_VZ."` ORDER BY `name` ASC", "id", "name");
+			$this->shop->view['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `vz` ASC, `name` ASC");
+
+			return $this->shop->render(WPSG_PATH_VIEW.'/admin/laender_list.phtml', false);
+
+		} // private function laenderList()
+
 		/**
 		 * Importiert die EU-LÀnder aus der Liste
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5746)
+++ /controller/wpsg_ShopController.class.php	(revision 5748)
@@ -3120,17 +3120,5 @@
 				
 			}
-			
-			if (!wpsg_isSizedString($this->get_option('wpsg_shopdata_name')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_owner')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_tel')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_fax')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_email')) &&
-            	!wpsg_isSizedString($this->get_option('wpsg_shopdata_street')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_zip')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_city')) &&
-             	!wpsg_isSizedString($this->get_option('wpsg_shopdata_bank_owner')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_bank_iban')) && !wpsg_isSizedString($this->get_option('wpsg_shopdata_bank_bic')))
-			{
-				
-				$this->addBackendError(wpsg_translate(
-            		'nohspc_'.__('Sie haben die Angaben zum Shop noch nicht ausgefÌllt. Klicken sie <a href="#1#">hier</a> um die Angaben zu vervollstÀndigen.', 'wpsg'),
-					WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=shopdata'
-				), 'wpsg_message_shopdata');
-				
-			}
-			
+			 
 			if (!$this->hasMod('wpsg_mod_ordercondition'))
 			{
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 5746)
+++ /controller/wpsg_SystemController.class.php	(revision 5748)
@@ -359,5 +359,5 @@
 		 * Gibt die Backend Messages aus 
 		 */
-		public function writeBackendMessage()
+		public function writeBackendMessage($onlyMessage = false)
 		{
 
@@ -367,5 +367,5 @@
 			 
 			// Updatefehler etc.
-			$arPersistentBackendError = $this->get_option('wpsg_persistentBackendError');
+			/*$arPersistentBackendError = $this->get_option('wpsg_persistentBackendError');
 				
 			if (wpsg_isSizedArray($arPersistentBackendError))
@@ -393,8 +393,6 @@
 				if (wpsg_isSizedString($strMessageOut)) $strOut .= '<div id="message" class="wpsg_message error">'.$strMessageOut.'</div>';
 							
-			}
-			
-			//if (!isset($_SESSION['wpsg']['backendMessage']) && !isset($_SESSION['wpsg']['backendError'])) return $strOut;
-			
+			}*/
+
 			if (wpsg_isSizedArray($_SESSION['wpsg']['backendMessage']))
 			{
@@ -447,20 +445,25 @@
 			 
 			if (wpsg_isSizedString($strOut)) $strOut = '<div class="wrap">'.$strOut.'</div>';
-			
-			if (!$this->hasMod('wpsg_mod_core')) 
-			{
-				
-				// Free Version => Bannern
-				$banner = base64_decode(strrev('==wZwpmLwYDe4YDNyVmbuFmQtA1VvIXZu5WYi9yczVmcwRmcvd3LlRmLx4WZoNmbuVWYt5yZtl2LvoDc0RHa')); //http://img.maennchen1.de/wordpress/banner/WP-Banner468x60.jpg
-
-				if (@file_get_contents($banner))
-				{
-				
-					$strOut = '<div class="msg_wrap"><a href="http://shop.maennchen1.de/category/'.WPSG_FOLDERNAME.'/" target="_blank"><img src="'.$banner.'" /></a><br />'.$strOut.'</div>';
-					
-				}
-				
-			}
-			
+
+			if (!$onlyMessage)
+			{
+
+				if (!$this->hasMod('wpsg_mod_core'))
+				{
+
+					// Free Version => Bannern
+					$banner = base64_decode(strrev('==wZwpmLwYDe4YDNyVmbuFmQtA1VvIXZu5WYi9yczVmcwRmcvd3LlRmLx4WZoNmbuVWYt5yZtl2LvoDc0RHa')); //http://img.maennchen1.de/wordpress/banner/WP-Banner468x60.jpg
+
+					if (@file_get_contents($banner))
+					{
+
+						$strOut = '<div class="msg_wrap"><a href="http://shop.maennchen1.de/category/' . WPSG_FOLDERNAME . '/" target="_blank"><img src="' . $banner . '" /></a><br />' . $strOut . '</div>';
+
+					}
+
+				}
+
+			}
+
 			return $strOut;
 			
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 5746)
+++ /lib/filter_functions.inc.php	(revision 5748)
@@ -85,5 +85,5 @@
 				echo '<div id="wpsg_lizenz" style="display:none; margin-top:10px;">';
 				echo '<input type="file" name="wpsg_licence_file" />';
-				echo '<input type="submit" class="button" value="'.__('Lizenz aktivieren.', 'wpsg').'" name="wpsg_insertlicence_submit" />'; 
+				echo '<input type="submit" class="button" value="'.__('Lizenz aktivieren.', 'wpsg').'" name="wpsg_insertlicence_submit" />';
 				echo '</div>';
 				
Index: /mods/wpsg_mod_core.class.php
===================================================================
--- /mods/wpsg_mod_core.class.php	(revision 5746)
+++ /mods/wpsg_mod_core.class.php	(revision 5748)
@@ -117,5 +117,5 @@
 			
 				// Ihre Lizenz von wpShopGermany ist abgelaufen
-				$this->shop->addBackendError(base64_decode('SWhyZSBMaXplbnogdm9uIHdwU2hvcEdlcm1hbnkgaXN0IGFiZ2VsYXVmZW4='));
+				//$this->shop->addBackendError(base64_decode('SWhyZSBMaXplbnogdm9uIHdwU2hvcEdlcm1hbnkgaXN0IGFiZ2VsYXVmZW4='));
 			
 			}
Index: /mods/wpsg_mod_ordervars.class.php
===================================================================
--- /mods/wpsg_mod_ordervars.class.php	(revision 5746)
+++ /mods/wpsg_mod_ordervars.class.php	(revision 5748)
@@ -105,9 +105,8 @@
 			else if ($_REQUEST['do'] == 'del')
 			{
-				//die($_REQUEST['ov_id']);
+				
 				$result = $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERVARS."` WHERE `id` = '".wpsg_q($_REQUEST['ov_id'])."'");
-				
-				die($result);
-				//die($this->ov_list());
+
+				die($this->ov_list());
 				
 			}
Index: /views/admin/deinstall.phtml
===================================================================
--- /views/admin/deinstall.phtml	(revision 5746)
+++ /views/admin/deinstall.phtml	(revision 5748)
@@ -18,38 +18,34 @@
 
 <div class="wpsg_admin_content">
-	
-	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;noheader=1&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">
-	
+
+	<?php echo wpsg_drawForm_AdminboxStart(__('DatensÀtze löschen / Plugin deinstallieren', 'wpsg')); ?>
+
+	<form name="form1" class="form-horizontal" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;noheader=1&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">
+
 		<p><?php echo __('Bitte wÀhlen Sie aus, was Sie entfernen möchten?', 'wpsg'); ?></p>
-		
-		<label>
-			<input type="checkbox" value="1" name="wpsg_deinstall_products" />&nbsp;<?php echo wpsg_translate(__('Produkte (#1# DatensÀtze)', 'wpsg'), (($this->view['count_products'] > 0)?$this->view['count_products']:0)); ?>
-		</label><br />
-		<label>
-			<input type="checkbox" value="1" name="wpsg_deinstall_customer" />&nbsp;<?php echo wpsg_translate(__('Kunden (#1# DatensÀtze)', 'wpsg'), (($this->view['count_customer'] > 0)?$this->view['count_customer']:0)); ?>
-		</label><br />
-		<label>
-			<input type="checkbox" value="1" name="wpsg_deinstall_order" />&nbsp;<?php echo wpsg_translate(__('Bestellungen (#1# DatensÀtze)', 'wpsg'), (($this->view['count_order'] > 0)?$this->view['count_order']:0)); ?>			
-		</label><br />
-		<label>
-			<input type="checkbox" value="1" name="wpsg_deinstall_incompleteorder" />&nbsp;<?php echo wpsg_translate(__('UnvollstÀndige Bestellungen (#1# DatensÀtze)', 'wpsg'), (($this->view['count_order_incomplete'] > 0)?$this->view['count_order_incomplete']:0)); ?>
-		</label><br />
-		 			
+
+		<?php echo wpsg_drawForm_Checkbox('wpsg_deinstall_products', wpsg_translate(__('Produkte (#1# DatensÀtze)', 'wpsg'), (($this->view['count_products'] > 0)?$this->view['count_products']:0)), false, array('fullWidth' => true)); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_deinstall_customer', wpsg_translate(__('Kunden (#1# DatensÀtze)', 'wpsg'), (($this->view['count_customer'] > 0)?$this->view['count_customer']:0)), false, array('fullWidth' => true)); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_deinstall_order', wpsg_translate(__('Bestellungen (#1# DatensÀtze)', 'wpsg'), (($this->view['count_order'] > 0)?$this->view['count_order']:0)), false, array('fullWidth' => true)); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_deinstall_incompleteorder', wpsg_translate(__('UnvollstÀndige Bestellungen (#1# DatensÀtze)', 'wpsg'), (($this->view['count_order_incomplete'] > 0)?$this->view['count_order_incomplete']:0)), false, array('fullWidth' => true)); ?>
+
 		<br />
-		<label>
-			<input type="checkbox" value="1" name="wpsg_deinstall_core" />&nbsp;<?php echo __('Plugin, Programmdateien, Moduldateien und Datenbanktabellen', 'wpsg'); ?>
-		</label>
-		 			
+
+		<?php echo wpsg_drawForm_Checkbox('wpsg_deinstall_core', __('Plugin, Programmdateien, Moduldateien und Datenbanktabellen', 'wpsg'), false, array('fullWidth' => true)); ?>
+
 		<p class="submit"><input onclick="return wpsg_check_deinstall();" type="submit" value="<?php echo __('Deinstallation durchfÃŒhren', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>
-		
+
 		<div class="wpsg_hinweis">
-			<?php echo __('Hinweis: Es werden hier auch bereits gelöschte DatensÀtze angezeigt, da diese noch im System hinterlegt bleiben.', 'wpsg'); ?><br /><br />
+			<?php echo __('Hinweis: Es werden hier auch bereits gelöschte DatensÀtze angezeigt/gezÀhlt, da diese noch im System hinterlegt bleiben.', 'wpsg'); ?><br /><br />
 			<strong><?php echo __('Das Deinstallieren ist aber nicht umkehrbar!', 'wpsg'); ?></strong>
 		</div>
-	
+
 	</form>
+
+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
 </div>
 
-<script type="text/javascript">
+<script type="text/javascript">/* <![CDATA[ */
 
 	function wpsg_check_deinstall()
@@ -74,3 +70,3 @@
 	} // function wpsg_check_deinstall()
 
-</script>
+/* ]]> */</script>
Index: /views/admin/form/input.phtml
===================================================================
--- /views/admin/form/input.phtml	(revision 5746)
+++ /views/admin/form/input.phtml	(revision 5748)
@@ -9,6 +9,25 @@
 				type="text" 
 				class="form-control input-sm" 
-				name="<?php echo $this->view['field_name']; ?>" 
-				value="<?php echo wpsg_hspc($this->view['field_value']); ?>" 
+				name="<?php echo $this->view['field_name']; ?>"
+				autofocus="true"
+				tabindex="<?php
+
+					if (!isset($GLOBALS['wpsg']['tabindex']))
+					{
+
+						$GLOBALS['wpsg']['tabindex'] = 10;
+
+					}
+					else
+					{
+
+						$GLOBALS['wpsg']['tabindex'] += 10;
+
+					}
+
+					echo $GLOBALS['wpsg']['tabindex'];
+
+				?>"
+				value="<?php echo wpsg_hspc($this->view['field_value']); ?>"
 				id="<?php echo $this->view['field_id']; ?>"
 				placeholder="<?php echo wpsg_getStr($this->view['field_config']['placeholder']); ?>" 
Index: /views/admin/form/select.phtml
===================================================================
--- /views/admin/form/select.phtml	(revision 5746)
+++ /views/admin/form/select.phtml	(revision 5748)
@@ -7,5 +7,26 @@
 		<div class="wpsg_field_wrap">
 		
-			<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>
+			<select
+				id="<?php echo $this->view['field_id']; ?>"
+				name="<?php echo $this->view['field_name']; ?>"
+				tabindex="<?php
+
+				if (!isset($GLOBALS['wpsg']['tabindex']))
+				{
+
+					$GLOBALS['wpsg']['tabindex'] = 10;
+
+				}
+				else
+				{
+
+					$GLOBALS['wpsg']['tabindex'] += 10;
+
+				}
+
+				echo $GLOBALS['wpsg']['tabindex'];
+
+				?>"
+				class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>
 				
 				<?php 
Index: /views/admin/konfiguration.phtml
===================================================================
--- /views/admin/konfiguration.phtml	(revision 5746)
+++ /views/admin/konfiguration.phtml	(revision 5748)
@@ -28,18 +28,20 @@
 		  		
 					<?php if ($this->arLizenz['l'] == 0) { ?>
-					<div class="wpsg_form_field">
-						<div class="wpsg_form_left">
-							<?php echo __("Lizenzende", "wpsg"); ?>:
-						</div>
-						<div class="wpsg_form_right">
-							<?php if ($this->getDemoDays() < 0) { ?>
-							<p><?php echo wpsg_translate(__('Vor #1# Tage(n) abgelaufen.', 'wpsg'), abs($this->getDemoDays())); ?></p>
-							<?php } else { ?>
-							<p><?php echo wpsg_translate(__('#1# Tage verbleibend.', 'wpsg'), $this->getDemoDays()); ?></p>
-							<?php } ?>
-							<a rel="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DemoMode" title="DemoMode" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DemoMode" class="wpsg_form_help"></a>
-						</div>
-						<div class="wpsg_clear"></div>
-					</div>		
+						<?php
+
+                        if ($this->getDemoDays() < 0)
+                        {
+							$strText = wpsg_translate(__('Vor #1# Tage(n) abgelaufen.', 'wpsg'), abs($this->getDemoDays()));
+
+                            } else {
+
+                            $strText = wpsg_translate(__('#1# Tage verbleibend.', 'wpsg'), $this->getDemoDays());
+
+                        }
+
+                        echo wpsg_drawForm_Text(__('Lizenzende', 'wpsg'), $strText, '', array('help' => 'DemoMode'));
+
+                        ?>
+						
 					<?php } else { ?>
 					
Index: /views/admin/laender.phtml
===================================================================
--- /views/admin/laender.phtml	(revision 5746)
+++ /views/admin/laender.phtml	(revision 5748)
@@ -42,73 +42,5 @@
 		<div id="wpsg_country_list">
 
-			<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
-			<table class="table wpsg_table_country">
-
-				<tr>
-					<th class="col_check"><input type="checkbox" onclick="return wpsg_country_check_all();" style="margin-top:-2px;" /></th>
-					<th class="col_name"><?php echo __('LÀndername', 'wpsg'); ?></th>
-					<th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>
-					<th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>
-					<th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>
-					<th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>
-					<th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>
-					<th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>
-					<th class="col_action"></th>
-				</tr>
-
-				<?php foreach ($this->view['data'] as $l) { ?>
-				<tr id="<?php echo $l['id']; ?>">
-					<td class="col_check"><input type="checkbox" value="1" name="arDelete[<?php echo $l['id']; ?>]" /></td>
-					<td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
-					<td class="col_vz">
-						<?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>
-						<?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>
-						<?php } ?>
-					</td>
-					<td class="col_mwstsetting">
-						<?php if ($l['mwst'] == '2') { ?>
-						<?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>
-						<?php } else if ($l['mwst'] == '1') { ?>
-						<?php echo __('keine MwSt.', 'wpsg'); ?>
-						<?php } else { ?>
-						<?php echo __('mit MwSt.', 'wpsg'); ?>
-						<?php } ?>
-					</td>
-					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>
-					<?php } ?></td>
-					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>
-					<?php } ?></td>
-					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>
-					<?php } ?></td>
-					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>
-					<?php } ?></td>
-					<td class="col_action">
-
-						<a href="#" onclick="return wpsg_country_edit('<?php echo $l['id']; ?>');" class="glyphicon glyphicon-pencil"></a>
-						<a href="#" class="glyphicon glyphicon-trash"></a>
-
-					</td>
-				</tr>
-				<?php } ?>
-
-				<tr>
-
-					<td class="col_check"><span class="glyphicon glyphicon-trash"></span></td>
-					<td colspan="8">
-
-						<input type="submit" name="submit" onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button btn-xs" value="<?php echo __('Markierte LÀnder löschen', 'wpsg'); ?>" />
-
-					</td>
-
-				</tr>
-
-			</table>
-			<?php } else { ?>
-			<p><?php echo __('Noch keine LÀnder angelegt.', 'wpsg'); ?></p>
-			<?php } ?>
+            <?php echo $this->render(WPSG_PATH_VIEW.'/admin/laender_list.phtml'); ?>
 
 		</div>
@@ -118,6 +50,11 @@
 	</form>
 
-	<a href="#" onclick="return wpsg_country_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Land anlegen.', 'wpsg'); ?></a><br /><br />
-	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Versandzonenverwaltung', 'wpsg'); ?></a>
+	<a href="#" onclick="return wpsg_country_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Land anlegen.', 'wpsg'); ?></a><br />
+    <a href="#" onclick="return wpsg_country_import();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><? echo __('StandardlÀnder importieren.', 'wpsg'); ?></a><br />
+     <a href="#" onclick="return wpsg_country_importEU();"><span class="wpsg-glyphicon glyphicon glyphicon-import"></span><? echo __('EU-LÀnder importieren.', 'wpsg'); ?></a><br />
+
+    <br />
+
+    <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Versandzonenverwaltung', 'wpsg'); ?></a>
 	
 	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
@@ -141,4 +78,44 @@
 
 		} // function wpsg_country_add()
+
+        function wpsg_country_import()
+        {
+
+            if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;
+
+            jQuery('#wpsg_country_list').html('<img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" />');
+
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=import&noheader=1',
+                success: function(data) {
+
+                    jQuery('#wpsg_country_list').html(data);
+
+                }
+            } );
+
+            return false;
+
+        } // function wpsg_country_import()
+
+        function wpsg_country_importEU()
+        {
+
+            if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;
+
+            jQuery('#wpsg_country_list').html('<img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" />');
+
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=eu_import&noheader=1',
+                success: function(data) {
+
+                    jQuery('#wpsg_country_list').html(data);
+
+                }
+            } );
+
+            return false;
+
+        } // function wpsg_country_importEU()
 
 		function wpsg_country_save()
@@ -168,5 +145,5 @@
 
 			jQuery.ajax( {
-				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1&land_id' + land_id,
+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1&land_id=' + land_id,
 				success: function(data) { jQuery('#Modal_wpsg_country_edit .modal-body').html(data); }
 			} );
@@ -178,220 +155,3 @@
 	/* ]]> */</script>
 
-
-
-
-
-	<div class="wpsg_admin_box">	
-		
-		<h3>
-			<?php echo __('Neues Land hinzufÃŒgen', 'wpsg'); ?>
-			<a target="_blank" href="http://wpshopgermany.maennchen1.de/?p=839037" class="wpsg_form_help_notip"></a>	
-		</h3>
-		
-		<?php echo $this->render(WPSG_PATH_VIEW.'/admin/laender_edit.phtml'); ?>
-		
-		<h3><?php echo __('Bestehende LÀnder', 'wpsg'); ?></h3>
-	
-		<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
-		<table class="wpsg_admin_laender_list wpsg_admin_table" cellpadding="0" cellspacing="0">
-			<tr>
-				<th class="col_name"><?php echo __('LÀndername', 'wpsg'); ?></th>
-				<th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>
-				<th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>
-				<th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>
-				<th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>
-				<th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>
-				<th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>				
-				<th class="col_action"></th>
-			</tr>
-			<?php $i = 0; foreach ($this->view['data'] as $l) { $i ++; ?>
-			<tr id="wpsg_laenderrow_<?php echo $l['id']; ?>" class="<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
-				<td class="col_name data_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
-				<td class="col_vz data_vz">
-					<?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>
-					<?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>
-					<?php } ?>
-				</td>
-				<td class="col_mwstsetting data_mwst">
-					<?php if ($l['mwst'] == '2') { ?>
-					<?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>
-					<?php } else if ($l['mwst'] == '1') { ?>
-					<?php echo __('keine MwSt.', 'wpsg'); ?>
-					<?php } else { ?>
-					<?php echo __('mit MwSt.', 'wpsg'); ?>
-					<?php } ?>
-				</td>
-				<td class="col_mwst data_mwst_a">
-					<?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>
-					<?php } ?>					
-				</td>
-				<td class="col_mwst data_mwst_b">
-					<?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>
-					<?php } ?>					
-				</td>
-				<td class="col_mwst data_mwst_c">
-					<?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>
-					<?php } ?>					
-				</td>
-				<td class="col_mwst data_mwst_d">
-					<?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>
-						<?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>
-					<?php } ?>					
-				</td>
-				<td class="col_action">
-					
-					<a class="wpsg_icon wpsg_icon_edit" href="#" onclick="return wpsg_laender_edit(<?php echo $l['id']; ?>);"></a> 
-					<a class="wpsg_icon wpsg_icon_remove" href="#" onclick="return wpsg_laender_remove(<?php echo $l['id']; ?>);"></a>
-					
-				</td>
-			</tr>
-			<?php } ?>
-		</table>
-		<?php } else { ?>
-		<p><?php echo __('Noch keine LÀnder angelegt.', 'wpsg'); ?>
-		<?php } ?>
-		
-		<br /><br />
-		
-		<input type="button" onclick="return wpsg_laender_import();" value="<?php echo __('StandardlÀnder importieren', 'wpsg'); ?>" class="button" />
-		<input type="button" onclick="return wpsg_eu_laender_import();" value="<?php echo __('Standard EU-LÀnder importieren', 'wpsg'); ?>" class="button" />
-	
-		<script type="text/javascript">/* <![CDATA[ */
-
-			var land_load = false;
-
-			function wpsg_laender_import()
-			{
-
-				if (!confirm('<?php echo __('Sind sie sich sicher ?', 'wpsg'); ?>')) return false;
-
-				location.href = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=import&noheader=1";
-				
-				return false;
-				
-			}
-
-			function wpsg_eu_laender_import()
-			{
-
-				if (!confirm('<?php echo __('Sind sie sich sicher ?', 'wpsg'); ?>')) return false;
-
-				location.href = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=eu_import&noheader=1";
-				
-				return false;
-				
-			}
-
-			function wpsg_laender_save()
-			{
-
-				jQuery.ajax( {
-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=saveEdit&noheader=1',
-					data: {
-						form_data: jQuery('#wpsg_land_edit_form_edit').serialize()
-					},
-					success: function(data) {
- 
-						if (typeof data === 'object')
-						{
-
-							land_load = true;
- 
-							for (var i in data)
-							{
- 
-								jQuery('#wpsg_laenderrow_' + data['id']).find('.data_' + i).html(data[i]);
-								
-							}
-							
-							jQuery('#wpsg_laenderrow_edit > td > div').slideUp(100, function() {
-
-								jQuery('#wpsg_laenderrow_edit').remove();
-								land_load = false;
-								
-							} );
-							 
-						}
-						else alert(data);
-						
-					}
-				} );
-
-				return false;
-				
-			}
-	        
-			function wpsg_laender_edit(land_id)
-			{
-
-				if (land_load == true) return; land_load = true;
-
-				var edit_timeout = 0;
- 				
-				if (jQuery('#wpsg_laenderrow_edit > td > div').is(':visible'))
-				{
-
-					edit_timeout = 150;
- 					
-					jQuery('#wpsg_laenderrow_edit > td > div').slideUp(100, function() {
-
-						jQuery('#wpsg_laenderrow_edit').remove();
-						
-					} );
-					
-				}
-
-				window.setTimeout(function() {
- 
-					jQuery('#wpsg_laenderrow_' + land_id).after('<tr id="wpsg_laenderrow_edit"><td colspan="8"><img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" /><div style="display:none;"></div></td></tr>');
-				
-					jQuery.ajax( {
-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1',
-						data: {
-							land_id: land_id
-						},
-						success: function(data) {
-													
-							jQuery('#wpsg_laenderrow_edit > td > div').html(data);
-							jQuery('#wpsg_laenderrow_edit > td > img').hide();
-							jQuery('#wpsg_laenderrow_edit > td > div').slideDown(300, function() { land_load = false; } );
-							
-						}
-					} );
-
-				}, edit_timeout);
-
-				return false;
-				
-			}
-
-			function wpsg_laender_remove(land_id)
-			{
-
-				if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;
-
-				jQuery.ajax( {
-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=remove&noheader=1',
-					data: {
-						land_id: land_id
-					},
-					success: function(data) {
-												 
-						if (data === "1") jQuery('#wpsg_laenderrow_' + land_id).remove();
-						else alert(data);
-						
-					}
-				} );
-				
-				return false;
-
-			}
-        
-		/* ]]> */</script>
-	
-	</div>
-
 </div>
Index: /views/admin/laender_edit.phtml
===================================================================
--- /views/admin/laender_edit.phtml	(revision 5746)
+++ /views/admin/laender_edit.phtml	(revision 5748)
@@ -1,4 +1,8 @@
 <form id="wpsg_land_edit_form_edit" class="form-horizontal">
 
+	<?php if (wpsg_isSizedInt($this->view['land']['id'])) { ?>
+	<input type="hidden" name="id" value="<?php echo $this->view['land']['id']; ?>" />
+	<?php } ?>
+	
 	<?php echo wpsg_drawForm_Input('country[name]', __('LÀndername', 'wpsg'), wpsg_getStr($this->view['land']['name']), array('help' => 'wpsg_land_name')); ?>
 	<?php echo wpsg_drawForm_Input('country[kuerzel]', __('KÃŒrzel', 'wpsg'), wpsg_getStr($this->view['land']['kuerzel']), array('help' => 'wpsg_land_kuerzel')); ?>
@@ -13,5 +17,5 @@
 	<?php echo wpsg_drawForm_Input('country[mwst_c]', __('MwSt. Satz C (Normalsatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_c']), array('help' => 'wpsg_land_mwst_c')); ?>
 	<?php echo wpsg_drawForm_Input('country[mwst_d]', __('MwSt. Satz D (Zwischensatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_d']), array('help' => 'wpsg_land_mwst_d')); ?>
-	<?php echo wpsg_drawForm_Checkbox('country[standard]', __('Standardland', 'wpsg'), wpsg_getStr($this->view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?>
+	<?php echo wpsg_drawForm_Checkbox('standard', __('Standardland', 'wpsg'), wpsg_getStr($this->view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?>
 
 </form>
Index: /views/admin/laender_list.phtml
===================================================================
--- /views/admin/laender_list.phtml	(revision 5748)
+++ /views/admin/laender_list.phtml	(revision 5748)
@@ -0,0 +1,87 @@
+<?php
+
+    /**  Lieste der LÀnder im Backend */
+
+?>
+
+<?php echo $this->writeBackendMessage(true); ?>
+
+<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
+    <table class="table wpsg_table_country">
+
+        <thead>
+            <tr>
+                <th class="col_check"><input type="checkbox" onclick="return wpsg_country_check_all();" style="margin-top:-2px;" /></th>
+                <th class="col_name"><?php echo __('LÀndername', 'wpsg'); ?></th>
+                <th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>
+                <th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>
+                <th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>
+                <th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>
+                <th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>
+                <th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>
+                <th class="col_action"></th>
+            </tr>
+        </thead>
+
+        <tbody>
+            <?php foreach ($this->view['data'] as $l) { ?>
+                <tr id="<?php echo $l['id']; ?>" class="<?php echo (($this->get_option('wpsg_defaultland') == $l['id'])?'bg-info':''); ?>">
+                    <td class="col_check"><input type="checkbox" value="1" name="arDelete[<?php echo $l['id']; ?>]" /></td>
+                    <td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
+                    <td class="col_vz">
+                        <?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>
+                            <?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>
+                        <?php } ?>
+                    </td>
+                    <td class="col_mwstsetting">
+                        <?php if ($l['mwst'] == '2') { ?>
+                            <?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>
+                        <?php } else if ($l['mwst'] == '1') { ?>
+                            <?php echo __('keine MwSt.', 'wpsg'); ?>
+                        <?php } else { ?>
+                            <?php echo __('mit MwSt.', 'wpsg'); ?>
+                        <?php } ?>
+                    </td>
+                    <td class="col_mwst"><?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>
+                            <?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>
+                        <?php } ?></td>
+                    <td class="col_mwst"><?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>
+                            <?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>
+                        <?php } ?></td>
+                    <td class="col_mwst"><?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>
+                            <?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>
+                        <?php } ?></td>
+                    <td class="col_mwst"><?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>
+                            <?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>
+                        <?php } ?></td>
+                    <td class="col_action">
+
+                        <a href="#" onclick="return wpsg_country_edit('<?php echo $l['id']; ?>');" class="glyphicon glyphicon-pencil"></a>
+                        <a href="#" class="glyphicon glyphicon-trash"></a>
+
+                    </td>
+                </tr>
+            <?php } ?>
+        </tbody>
+        <tfoot>
+            <tr>
+
+                <td class="col_check"><span class="glyphicon glyphicon-trash"></span></td>
+                <td colspan="8">
+
+                    <input type="submit" name="submit" onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button btn-xs" value="<?php echo __('Markierte LÀnder löschen', 'wpsg'); ?>" />
+
+                </td>
+
+            </tr>
+        </tfoot>
+    </table>
+
+    <br />
+
+    <div class="info"><?php echo __('Das Standardland ist <span class="bg-info">blau</span> markiert und wird fÃŒr die MwSt. Berechnung im Backend verwendet.', 'wpsg'); ?></div>
+
+<?php } else { ?>
+    <p><?php echo __('Noch keine LÀnder angelegt.', 'wpsg'); ?></p>
+<?php } ?>
+
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 5746)
+++ /views/css/admin.css	(revision 5748)
@@ -39,4 +39,5 @@
 #wpsg-bs .table-body-striped > tbody:nth-of-type(odd) { background-color:#f9f9f9; }
 #wpsg-bs .checkbox input { margin-top:1px; }
+#wpsg-bs .info { font-style:italic; }
 
 /* Allgemeine Klassen */
@@ -69,4 +70,5 @@
 .wpsg_table_country .col_action { width:60px; text-align:right; }
 .wpsg_table_country .col_action a { margin-left:5px; }
+.wpsg_table_country tr:last-child .glyphicon-trash { margin-top:5px; }
 
     /* Tabelle der Berechtigungen */
Index: /views/mods/mod_ordervars/ov_list.phtml
===================================================================
--- /views/mods/mod_ordervars/ov_list.phtml	(revision 5746)
+++ /views/mods/mod_ordervars/ov_list.phtml	(revision 5748)
@@ -26,5 +26,7 @@
             <td class="wpsg_delcol">
 
-                <a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Bestellvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removeOV(<?php echo $ov['id']; ?>);"></a>
+                <a class="" href="#" title="<?php echo __('Bestellvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removeOV(<?php echo $ov['id']; ?>);">
+                    <span class="glyphicon glyphicon-trash"></span>
+                </a>
 
                 <script type="text/javascript">
@@ -79,16 +81,23 @@
                     function wpsg_removeOV(id)
                     {
-                        jQuery.ajax({
+
+                        if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;
+
+                        jQuery('#wpsg_ov_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+                        jQuery.ajax( {
                             url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=del',
                             data: {
                                 ov_id: id
                             },
-                            success: function(data){
-                                if (data == 1)
-                                {
-                                    location.reload();
-                                }
+                            success: function(data) {
+
+                                jQuery('#wpsg_ov_list').html(data);
+
                             }
-                        });
+                        } );
+
+                        return false;
+
                     }