diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index 02507d798..e89d83a2a 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -253,12 +253,17 @@ class eurl_admin_ui extends e_admin_controller_ui
 
 		//  e107::getDebug()->log($sefActive);
 
+		$plg = e107::getPlug();
+
 		foreach($eUrl as $plug=>$val)
 		{
+
+			$plg->load($plug);
+
 			$active = !empty($sefActive[$plug]) ? true : false;
 			$text .= "<table class='table table-striped table-bordered' style='margin-bottom:40px'>
 			<colgroup>
-				<col style='min-width:200px' />
+				<col style='min-width:220px' />
 				<col style='width:45%' />
 				<col style='width:45%' />
 			</colgroup>";
@@ -269,7 +274,7 @@ class eurl_admin_ui extends e_admin_controller_ui
 				'switch' => 'mini',
 			));
 
-			$text .= "<tr class='active'><td ><h4>" . $plug . "</h4></td><td colspan='2'>" . $switch . "</td></tr>";
+			$text .= "<tr class='active'><td><h4>" . $plg->getName() . "</h4></td><td colspan='2'>" . $switch . "</td></tr>";
 			$text .= "<tr><th>Key</th><th>Regular Expression</th>
 
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index aaba750d4..710343e6a 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2325,12 +2325,12 @@ class e_form
 		if(deftrue('e_DEBUG') && e_ADMIN_AREA === true)
 		{
 			$options['switch'] = 'small';
-			$options['wrapperClass'] = 'wrapper form-control';
+
 			$label_enabled = ($label_enabled) ? strtoupper($label_enabled) : strtoupper(LAN_ON);
 			$label_disabled = ($label_disabled) ?  strtoupper($label_disabled): strtoupper(LAN_OFF);
 
 		}
-		
+
 		$options_on['label'] = $label_enabled ? defset($label_enabled, $label_enabled) : LAN_ENABLED;
 		$options_off['label'] = $label_disabled ? defset($label_disabled, $label_disabled) : LAN_DISABLED;
 
@@ -2347,12 +2347,13 @@ class e_form
 					'size'    => $options['switch'],
 					'onText'  => $options_on['label'],
 					'offText' => $options_off['label'],
+
 				),
 			);
 
-			if(isset($options['wrapperClass']))
+			if(e_ADMIN_AREA === true)
 			{
-				$js_options[$name]['wrapperClass'] = $options['wrapperClass'];
+				$js_options[$name]['wrapperClass'] =  'wrapper form-control';
 			}
 
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index dd24a15ec..6e7d9ad5e 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1417,7 +1417,7 @@ td.forumheader3 .form-control { display:inherit }
 
 .navbar-nav > li > a.admin-icon-avatar { padding-top: 11px; padding-bottom: 10px;}
 
-form#simplesef h4 { margin: 0 }
+form#simplesef h4 { margin: 4px }
 .adminlist tr > td { min-height:50px; }
 
 .admin-icon-debug i {  margin-right:10px; cursor:help}