diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php
index f0d161246..543c8b53d 100755
--- a/e107_core/templates/usersettings_template.php
+++ b/e107_core/templates/usersettings_template.php
@@ -220,12 +220,12 @@ $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = 			"<div class='form-group'>
 														";
 
 $USERSETTINGS_WRAPPER['edit']['AVATAR_UPLOAD'] = 		"<div class='form-group'>
-														<label for='customtitle' class='col-sm-3 control-label'>".LAN_USET_26."</label>
+														<label for='avatar' class='col-sm-3 control-label'>".LAN_USET_26."</label>
 												       	<div class='col-sm-9'>{---}</div>
 													   	</div>
 														";
 $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = 		"<div class='form-group'>
-														<label for='customtitle' class='col-sm-3 control-label'>".LAN_USER_06."</label>
+														<label for='photo' class='col-sm-3 control-label'>".LAN_USER_06."</label>
 												       	<div class='col-sm-9'>{---}</div>
 													   	</div>
 														";
@@ -238,7 +238,7 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE']			= "<div class='form-group'>
 													   	</div>
 													 ";
 
-
+	// $USERSETTINGS_WRAPPER['edit']['USEREXTENDED_ALL']	= "<div class='form-group'>{---}</div>";
 
 
 
@@ -249,8 +249,9 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE']			= "<div class='form-group'>
 $USERSETTINGS_TEMPLATE['edit'] = "
 
 <div>
-	
+
 	{USERNAME}
+
 	{LOGINNAME}
 
 
@@ -271,7 +272,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
 	{CUSTOMTITLE}
 
 	{PASSWORD1}
-	{PASSWORD_LEN}
+
 	{PASSWORD2}
 
 
@@ -281,7 +282,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
 	{HIDEEMAIL=radio}
 	</div>
 	</div>
-	
+
 	<div class='form-group'>
 	<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_07.req($pref['signup_option_image'])."</label>
 	<div class='col-sm-9'>
@@ -292,11 +293,11 @@ $USERSETTINGS_TEMPLATE['edit'] = "
 	{AVATAR_UPLOAD}
 	{PHOTO_UPLOAD}
 
+
 	{USERCLASSES}
 	{USEREXTENDED_ALL=tabs}
 
-	
-	{SIGNATURE=cols=58&rows=4}	
+	{SIGNATURE}
 	{SIGNATURE_HELP}
 
 	 <div class='form-group'>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 6afc4d6ff..c33d3edff 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1333,7 +1333,8 @@ class e_form
 			
 			case 'small':
 				$rows = '7';
-				$height = "style='height:250px'"; // inline required for wysiwyg
+				$height = "style='height:230px'"; // inline required for wysiwyg
+				$size = "input-block-level";
 			break;
 						
 			case 'medium':
@@ -1363,7 +1364,7 @@ class e_form
 		
 		$ret = "<div class='bbarea {$size}'>
 		<div class='field-spacer'><!-- --></div>\n";
-		
+
 
 		$ret .=	e107::getBB()->renderButtons($template,$help_tagid);
 		$ret .=	$this->textarea($name, $value, $rows, 70, $options, $counter); // higher thank 70 will break some layouts. 
@@ -1371,7 +1372,7 @@ class e_form
 		$ret .= "</div>\n";
 		
 		$_SESSION['media_category'] = $mediaCat; // used by TinyMce. 
-		
+
 		e107::wysiwyg(true); // bbarea loaded, so activate wysiwyg (if enabled in preferences)
 	
 		
diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index fa06ed67b..6f1cfa1b5 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -718,9 +718,9 @@ class e_parse_shortcode
 		$this->addedCodes = NULL;
 		
 		// former $sc_style - do it once here and not on every doCode loop - performance
-		
-		$this->sc_style = e107::scStyle(); 	//FIXME - BC Problems and conflicts. - XXX Commenting this out will fix #3 below. 
-	
+
+		$this->sc_style = e107::scStyle(); 	//FIXME - BC Problems and conflicts.
+
 		/* --------- BUG TEST Scenario -------------- 
 		 * Front-end Theme: Bootstrap
 		 * MENU-1 contains '{NAVIGATION=side}' on top and chatbox_menu below
@@ -756,9 +756,14 @@ class e_parse_shortcode
 			// Do it only once per parsing cylcle and not on every doCode() loop - performance
 			if(method_exists($this->addedCodes, 'wrapper'))
 			{
-				$this->wrappers = e107::templateWrapper($this->addedCodes->wrapper()); 
+				$tmpWrap = e107::templateWrapper($this->addedCodes->wrapper());
+				if(!empty($tmpWrap)) // FIX for #3 above.
+				{
+					$this->wrappers = array_merge($this->wrappers,$tmpWrap);
+				}
 			}
-			
+
+
 			/*
 			$classname = get_class($extraCodes);