diff --git a/layouts/joomla/modal/body.php b/layouts/joomla/modal/body.php
new file mode 100644
index 0000000000000..a2d82a7e454ee
--- /dev/null
+++ b/layouts/joomla/modal/body.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
+ *
+ */
+?>
+<div class="modal-body">
+	<?php echo $body; ?>
+</div>
diff --git a/layouts/joomla/modal/footer.php b/layouts/joomla/modal/footer.php
new file mode 100644
index 0000000000000..995509370e936
--- /dev/null
+++ b/layouts/joomla/modal/footer.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
+ *
+ */
+?>
+<div class="modal-footer">
+	<?php echo $params['footer']; ?>
+</div>
diff --git a/layouts/joomla/modal/header.php b/layouts/joomla/modal/header.php
new file mode 100644
index 0000000000000..6868e086d6cc6
--- /dev/null
+++ b/layouts/joomla/modal/header.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
+ *
+ */
+?>
+<div class="modal-header">
+	<?php if (!isset($params['closeButton']) || $params['closeButton']) : ?>
+		<button type="button" class="close" data-dismiss="modal">×</button>
+	<?php endif; ?>
+	<?php if (isset($params['title'])) : ?>
+		<h3><?php echo $params['title']; ?></h3>
+	<?php endif; ?>
+</div>
diff --git a/layouts/joomla/modal/iframe.php b/layouts/joomla/modal/iframe.php
new file mode 100644
index 0000000000000..436f219403cc6
--- /dev/null
+++ b/layouts/joomla/modal/iframe.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
+ *
+ */
+
+$iframeAttributes = array(
+	'class' => 'iframe',
+	'src'   => $params['url']
+);
+
+if (isset($params['height']))
+{
+	$iframeAttributes['height'] = $params['height'];
+}
+
+if (isset($params['width']))
+{
+	$iframeAttributes['width'] = $params['width'];
+}
+?>
+<iframe <?php echo JArrayHelper::toString($iframeAttributes); ?>></iframe>
diff --git a/layouts/joomla/modal/main.php b/layouts/joomla/modal/main.php
new file mode 100644
index 0000000000000..d3d55682d99b2
--- /dev/null
+++ b/layouts/joomla/modal/main.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
+ *
+ */
+
+$modalClasses = array('modal', 'hide');
+
+if (!isset($params['animation']) || $params['animation'])
+{
+	array_push($modalClasses, 'fade');
+}
+
+$modalAttributes = array(
+	'tabindex' => '-1',
+	'class'    => implode(' ', $modalClasses)
+);
+
+if (isset($params['backdrop']))
+{
+	$modalAttributes['data-backdrop'] = (is_bool($params['backdrop']) ? ($params['backdrop'] ? 'true' : 'false') : $params['backdrop']);
+}
+
+if (isset($params['keyboard']))
+{
+	$modalAttributes['data-keyboard'] = (is_bool($params['keyboard']) ? ($params['keyboard'] ? 'true' : 'false') : 'true');
+}
+
+if (isset($params['url']))
+{
+	$iframeHtml = JLayoutHelper::render('joomla.modal.iframe', $displayData);
+
+	JFactory::getDocument()->addScriptDeclaration("
+		jQuery(document).ready(function($) {
+			$('#" . $selector . "').on('show', function() {
+				var modalBody = $(this).find('.modal-body');
+
+				// Destroy previous iframe if loaded
+				modalBody.find('iframe').remove();
+
+				// Load iframe
+				modalBody.prepend('" . trim($iframeHtml) . "');
+
+			});
+		});
+	");
+}
+?>
+<div id="<?php echo $selector; ?>" <?php echo JArrayHelper::toString($modalAttributes); ?>>
+	<?php
+		// Header
+		if (!isset($params['closeButton']) || isset($params['title']) || $params['closeButton'])
+		{
+			echo JLayoutHelper::render('joomla.modal.header', $displayData);
+		}
+
+		// Body
+		echo JLayoutHelper::render('joomla.modal.body', $displayData);
+
+		// Footer
+		if (isset($params['footer']))
+		{
+			echo JLayoutHelper::render('joomla.modal.footer', $displayData);
+		}
+	?>
+</div>
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 9f0e48d97c9f7..28f70f0b955df 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -256,6 +256,7 @@ public static function framework($debug = null)
 	 * @return  void
 	 *
 	 * @since   3.0
+	 * @deprecated  4.0  Unused, JS Not working
 	 */
 	public static function modal($selector = 'modal', $params = array())
 	{
@@ -293,34 +294,35 @@ public static function modal($selector = 'modal', $params = array())
 	 *
 	 * @param   string  $selector  The ID selector for the modal.
 	 * @param   array   $params    An array of options for the modal.
-	 * @param   string  $footer    Optional markup for the modal footer
+	 *                             Options for the modal can be:
+	 *                             - title     string   The modal title
+	 *                             - backdrop  mixed    A boolean select if a modal-backdrop element should be included (default = true)
+	 *                                                  The string 'static' includes a backdrop which doesn't close the modal on click.
+	 *                             - keyboard  boolean  Closes the modal when escape key is pressed (default = true)
+	 *                             - closeButton  boolean  Display modal close button (default = true)
+	 *                             - animation boolean  Fade in from the top of the page (default = true)
+	 *                             - footer    string   Optional markup for the modal footer
+	 *                             - url       string   URL of a resource to be inserted as an <iframe> inside the modal body
+	 *                             - height    string   height of the <iframe> containing the remote resource
+	 *                             - width     string   width of the <iframe> containing the remote resource
+	 * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the url option is set
 	 *
 	 * @return  string  HTML markup for a modal
 	 *
 	 * @since   3.0
 	 */
-	public static function renderModal($selector = 'modal', $params = array(), $footer = '')
+	public static function renderModal($selector = 'modal', $params = array(), $body = '')
 	{
-		// Ensure the behavior is loaded
-		static::modal($selector, $params);
-
-		$html = "<div class=\"modal hide fade\" id=\"" . $selector . "\">\n";
-		$html .= "<div class=\"modal-header\">\n";
-		$html .= "<button type=\"button\" class=\"close\" data-dismiss=\"modal\">×</button>\n";
-		$html .= "<h3>" . $params['title'] . "</h3>\n";
-		$html .= "</div>\n";
-		$html .= "<div id=\"" . $selector . "-container\">\n";
-		$html .= "</div>\n";
-		$html .= "</div>\n";
-
-		$html .= "<script>";
-		$html .= "jQuery('#" . $selector . "').on('show', function () {\n";
-		$html .= "document.getElementById('" . $selector . "-container').innerHTML = '<div class=\"modal-body\"><iframe class=\"iframe\" src=\""
-			. $params['url'] . "\" height=\"" . $params['height'] . "\" width=\"" . $params['width'] . "\"></iframe></div>" . $footer . "';\n";
-		$html .= "});\n";
-		$html .= "</script>";
+		// Include Bootstrap framework
+		static::framework();
 
-		return $html;
+		$layoutData = array(
+			'selector' => $selector,
+			'params'   => $params,
+			'body'     => $body
+		);
+
+		return JLayoutHelper::render('joomla.modal.main', $layoutData);
 	}
 
 	/**