diff --git a/administrator/components/com_banners/banners.xml b/administrator/components/com_banners/banners.xml
index 209b2e28318db..efd87b79315f0 100644
--- a/administrator/components/com_banners/banners.xml
+++ b/administrator/components/com_banners/banners.xml
@@ -61,4 +61,3 @@
 		</languages>
 	</administration>
 </extension>
-
diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
index e5fe8aa5a39dd..867343414cb97 100644
--- a/administrator/components/com_banners/views/client/tmpl/edit.php
+++ b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -13,16 +13,15 @@
 JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 
-JFactory::getDocument()->addScriptDeclaration(
-	'
+JFactory::getDocument()->addScriptDeclaration('
 	Joomla.submitbutton = function(task)
 	{
 		if (task == "client.cancel" || document.formvalidator.isValid(document.getElementById("client-form")))
 		{
 			Joomla.submitform(task, document.getElementById("client-form"));
 		}
-	};'
-);
+	};
+');
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php
index 31d061cc43c03..1f5d88f3e7e4a 100644
--- a/administrator/components/com_banners/views/download/tmpl/default.php
+++ b/administrator/components/com_banners/views/download/tmpl/default.php
@@ -25,8 +25,8 @@ class="form-validate">
 			<?php echo $field->input; ?>
 		<?php endforeach; ?>
 		<div class="clr"></div>
-		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.jModalClose()', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
-		<button type="button" class="btn" onclick="window.parent.jModalClose();"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>
+		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#modal-download\').modal(\'hide\')', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
+		<button type="button" class="btn" onclick="window.parent.jQuery('#modal-download').modal('hide');"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>
 
 	</fieldset>
 </form>
diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php
index 8eff96676d277..5263e732564a4 100644
--- a/administrator/components/com_banners/views/tracks/tmpl/default.php
+++ b/administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -11,7 +11,6 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 JHtml::_('behavior.multiselect');
-JHtml::_('behavior.modal', 'a.modal');
 JHtml::_('formbehavior.chosen', 'select');
 
 $user       = JFactory::getUser();
@@ -20,8 +19,7 @@
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $sortFields = $this->getSortFields();
 
-JFactory::getDocument()->addScriptDeclaration(
-	'
+JFactory::getDocument()->addScriptDeclaration('
 	Joomla.orderTable = function()
 	{
 		table = document.getElementById("sortTable");
@@ -41,9 +39,10 @@
 	Joomla.closeModalDialog = function()
 	{
 		window.jQuery("#modal-download").modal("hide");
-	};'
-);
+	};
+');
 ?>
+
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
diff --git a/modules/mod_banners/helper.php b/modules/mod_banners/helper.php
index d414eb0a10e13..a578526d942a2 100644
--- a/modules/mod_banners/helper.php
+++ b/modules/mod_banners/helper.php
@@ -12,9 +12,7 @@
 /**
  * Helper for mod_banners
  *
- * @package     Joomla.Site
- * @subpackage  mod_banners
- * @since       1.5
+ * @since  1.5
  */
 class ModBannersHelper
 {
@@ -28,6 +26,7 @@ class ModBannersHelper
 	public static function &getList(&$params)
 	{
 		JModelLegacy::addIncludePath(JPATH_ROOT . '/components/com_banners/models', 'BannersModel');
+
 		$document = JFactory::getDocument();
 		$app      = JFactory::getApplication();
 		$keywords = explode(',', $document->getMetaData('keywords'));