diff --git a/e107_core/bbcodes/bb_alert.php b/e107_core/bbcodes/bb_alert.php
new file mode 100644
index 000000000..04c77a7d6
--- /dev/null
+++ b/e107_core/bbcodes/bb_alert.php
@@ -0,0 +1,60 @@
+<?php
+ /**
+ * Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * 
+ * DIV block bbcode
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+// This is a generic and 'responsive' video bbcode. Handles  Youtube and eventually html5 video tags. 
+
+class bb_alert extends e_bb_base
+{
+	/**
+	 * Called prior to save
+	 * Re-assemble the bbcode
+	 */
+	function toDB($code_text, $parm)
+	{
+		if(!empty($parm))
+		{
+			$ins = '='.$parm;
+		}
+		else
+		{
+			$ins = '';
+		}
+
+		return '[alert'.$ins.']'.$code_text.'[/alert]';
+	}
+
+	/**
+	 *	Bootstrap Alert container.
+	 * @param $code_text :
+	 */
+	function toHTML($code_text, $parm='')
+	{
+
+		if(!empty($parm))
+		{
+			$style = "alert alert-".$parm;
+		}
+		else
+		{
+			$style = "alert alert-default";
+		}
+
+		return "<div class='".$style."'>".$code_text."</div>";
+	}
+	
+	
+}
+
+
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
index 0002fb9cb..d7628a5ab 100644
--- a/e107_core/shortcodes/batch/page_shortcodes.php
+++ b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -267,12 +267,14 @@ class cpage_shortcodes extends e_shortcode
 		
 		$buttonText = (empty($this->var['menu_button_text'])) ? LAN_READ_MORE : $this->var['menu_button_text'];
 		$buttonUrl	= (empty($this->var['menu_button_url'])) ? $url : $tp->replaceConstants($this->var['menu_button_url']);
-		
+		$buttonTarget = (empty($this->var['menu_button_target'])) ? '' : ' target="'.$this->var['menu_button_target'].'" '; //TODO add pref to admin area.
+
 		$text = vartrue($options['text'], $buttonText);
 		$size = vartrue($options['size'], "");
+
 		$inc = ($size) ? " btn-".$size : "";
 		
-		return '<a class="cpage btn btn-primary btn-cpage'.$inc.'" href="'.$buttonUrl.'">'.$text.'</a>';
+		return '<a class="cpage btn btn-primary btn-cpage'.$inc.'" href="'.$buttonUrl.'" '.$buttonTarget.'>'.$text.'</a>';
 	}	
 	
 	
@@ -281,7 +283,12 @@ class cpage_shortcodes extends e_shortcode
 		$tp 	= e107::getParser(); 
 	//
 		return $tp->toHTML($this->var['menu_title'], true, 'TITLE');
-	}	
+	}
+
+	function sc_cmenuname($parm='')
+	{
+		return $this->var['menu_name'];
+	}
 
 
 	function sc_cmenubody($parm='')
diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 7af644aa3..1d5dc426b 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -37,6 +37,7 @@ class e_bbcode
 		$pref = e107::getPref();
 		
 		$this->core_bb = array(
+		'alert',
 		'blockquote', 'img', 'i', 'u', 'center',
 		'_br', 'color', 'size', 'code',
 		 'flash', 'link', 'email',
diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php
index d31c4865a..3d02566fe 100644
--- a/e107_plugins/tinymce4/wysiwyg.php
+++ b/e107_plugins/tinymce4/wysiwyg.php
@@ -450,6 +450,7 @@ class wysiwyg
                  {title: 'Float Clear', block: 'div', classes: 'clearfix'},
                  {title: 'Lead', block: 'p', classes: 'lead'},
                  {title: 'Well', block: 'div', classes: 'well'},
+				 {title: 'Row', block: 'div', classes: 'row'},
                  {title: '1/4 Width Block', block: 'div', classes: 'col-md-3 col-sm-12'},
                  {title: '3/4 Width Block', block: 'div', classes: 'col-md-9 col-sm-12'},
                  {title: '1/3 Width Block', block: 'div', classes: 'col-md-4 col-sm-12'},