diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index d76d5f442..13d560545 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -6739,7 +6739,7 @@ var_dump($select_options);*/
 				}
 				else
 				{
-					$ret = "(Method ".$meth." not found in ".get_class($cls).")";
+					$ret = "<div class='alert alert-warning' style='display:inline'>Method <b>".$meth."</b> not found in <b>".get_class($cls)."</b></div>";
 				}
 
 			break;
@@ -7336,6 +7336,7 @@ var_dump($select_options);*/
 						$tabs[$tabId] = array('caption'=> $label, 'text'=>$this->renderCreateFieldset($elid, $data, $model, $tabId));
 					}
 
+
 					$text .= $this->tabs($tabs);
 				}
 				else   // No Tabs Present 
@@ -7391,14 +7392,10 @@ var_dump($select_options);*/
 		$text = '';
 
 		// required fields - model definition
-		$model_required = $model->getValidationRules();
-		$required_help = false;
-		$hidden_fields = array();
-
-
-		$helpTipLocation = $this->_help_location;
-		$help = '';
-
+		$model_required     = $model->getValidationRules();
+		$required_help      = false;
+		$hidden_fields      = array();
+		$helpTipLocation    = $this->_help_location;
 
 		foreach($fdata['fields'] as $key => $att)
 		{
@@ -7415,7 +7412,7 @@ var_dump($select_options);*/
 			
 			if($key === 'checkboxes' || $key === 'options' || (varset($att['type']) === null) || (varset($att['type']) === false))
 			{
-				continue;	
+				continue;
 			}
 
 			$parms = vartrue($att['formparms'], array());
@@ -7425,10 +7422,6 @@ var_dump($select_options);*/
 			}
 			$label = !empty($att['note']) ? '<div class="label-note">'.deftrue($att['note'], $att['note']).'</div>' : '';
 
-			if($helpTipLocation !== -1) // -1 = help disabled.
-			{
-			//	$help = !empty($att['help']) ? '<div class="field-help" data-placement="left">'.deftrue($att['help'], $att['help']).'</div>' : '';
-			}
 
 			$valPath = trim(vartrue($att['dataPath'], $key), '/');
 			$keyName = $key;
@@ -7476,7 +7469,7 @@ var_dump($select_options);*/
 				}
 				unset($tmp);
 			}
-			
+
 			// type null - system (special) fields
 			if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
 			{
@@ -7515,11 +7508,11 @@ var_dump($select_options);*/
 				$leftCell = "<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title'])). '</span>' .$required.$label;
 
 				$leftCell .= $this->help(varset($att['help']), 'before');
-				$rightCell = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()), $model->getId()). ' '.$help;
+				$rightCell = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()), $model->getId());
 				$rightCell .= $this->help(varset($att['help']), 'after');
 
 				$att['writeParms'] = $writeParms;
-				 
+
 				$text .= $this->renderCreateFieldRow($leftCell, $rightCell, $att);
 				
 				
diff --git a/e107_themes/bootstrap3/css/modern-dark.css b/e107_themes/bootstrap3/css/modern-dark.css
index b7c60c8da..9cc849877 100644
--- a/e107_themes/bootstrap3/css/modern-dark.css
+++ b/e107_themes/bootstrap3/css/modern-dark.css
@@ -1300,7 +1300,7 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance
 .tooltip.right{margin-left:3px;padding:0 5px}
 .tooltip.bottom{margin-top:3px;padding:5px 0}
 .tooltip.left{margin-left:-3px;padding:0 5px}
-.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:rgba(0,0,0,.9);border-radius:4px}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:left;background-color:rgba(0,0,0,.9);border-radius:4px}
 .popover,.popover-title{font-size:16px;background-color:#337ab7}
 .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}
 .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:rgba(0,0,0,.9)}
diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css
index 22a0fd4c2..f5ad573b6 100644
--- a/e107_themes/bootstrap3/css/modern-light.css
+++ b/e107_themes/bootstrap3/css/modern-light.css
@@ -1286,7 +1286,7 @@
         .tooltip.right{margin-left:3px;padding:0 5px}
         .tooltip.bottom{margin-top:3px;padding:5px 0}
         .tooltip.left{margin-left:-3px;padding:0 5px}
-        .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:rgba(0,0,0,.9);border-radius:4px}
+        .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:left;background-color:rgba(0,0,0,.9);border-radius:4px}
         .popover,.popover-title{font-size:16px;background-color:#337ab7}
         .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}
         .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:rgba(0,0,0,.9)}
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 2d2cfadfc..46ac665aa 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -128,8 +128,8 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 					placement: placement,
 					container: 'body',
 					delay: {
-						show: 200,
-						hide: 600
+						show: 150,
+						hide: 700
 					}
 				});
 			});