diff --git a/administrator/components/com_banners/models/forms/download.xml b/administrator/components/com_banners/models/forms/download.xml
index fbaed4e8e8f28..0c90b70bc95d4 100644
--- a/administrator/components/com_banners/models/forms/download.xml
+++ b/administrator/components/com_banners/models/forms/download.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+
 	<fieldset name="details">
+
 		<field
 			name="compressed"
 			type="radio"
 			label="COM_BANNERS_FIELD_COMPRESSED_LABEL"
 			description="COM_BANNERS_FIELD_COMPRESSED_DESC"
-			class="btn-group btn-group-yesno"
 			default="0"
+			class="btn-group btn-group-yesno"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -16,9 +18,15 @@
 		<field
 			name="basename"
 			type="text"
+			size="40"
 			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+		/>
+
+		<field
+			name="basename_info"
+			type="note"
 			description="COM_BANNERS_FIELD_BASENAME_DESC"
-			size="40"
+			class="alert alert-info"
 		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php
index 85277d11c0dc8..b14e9910659a5 100644
--- a/administrator/components/com_banners/views/download/tmpl/default.php
+++ b/administrator/components/com_banners/views/download/tmpl/default.php
@@ -8,25 +8,30 @@
  */
 
 defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
 ?>
-<form
-	action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
-	method="post"
-	name="adminForm"
-	id="download-form"
-	class="form-validate">
-	<fieldset class="adminform">
-		<legend><?php echo JText::_('COM_BANNERS_TRACKS_DOWNLOAD'); ?></legend>
+<div class="container-popup">
+	<form
+		class="form-horizontal form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		method="post">
 
 		<?php foreach ($this->form->getFieldset() as $field) : ?>
-			<?php if (!$field->hidden) : ?>
-				<?php echo $field->label; ?>
-			<?php endif; ?>
-			<?php echo $field->input; ?>
+			<?php echo $this->form->renderField($field->fieldname); ?>
 		<?php endforeach; ?>
-		<div class="clr"></div>
-		<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>
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>
diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php
index e32fdc47672cd..180d008a8d45a 100644
--- a/administrator/components/com_banners/views/tracks/tmpl/default.php
+++ b/administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -83,6 +83,26 @@
 				</tbody>
 			</table>
 		<?php endif; ?>
+
+		<?php // Load the export form ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'downloadModal',
+			array(
+				'title'       => JText::_('COM_BANNERS_TRACKS_DOWNLOAD'),
+				'url'         => JRoute::_('index.php?option=com_banners&amp;view=download&amp;tmpl=component'),
+				'height'      => '370px',
+				'width'       => '300px',
+				'modalWidth'  => '40',
+				'footer'      => '<button class="btn" data-dismiss="modal" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_("COM_BANNERS_CANCEL") . '</button>'
+						. '<button class="btn btn-success" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+						. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
+			)
+		); ?>
+
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
 		<?php echo JHtml::_('form.token'); ?>
diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php
index 0135cafaa5c40..015f774455c4f 100644
--- a/administrator/components/com_banners/views/tracks/view.html.php
+++ b/administrator/components/com_banners/views/tracks/view.html.php
@@ -87,7 +87,19 @@ protected function addToolbar()
 		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'bookmark banners-tracks');
 
 		$bar = JToolbar::getInstance('toolbar');
-		$bar->appendButton('Popup', 'download', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
+
+		// Instantiate a new JLayoutFile instance and render the export button
+		$layout = new JLayoutFile('joomla.toolbar.modal');
+
+		$dhtml  = $layout->render(
+			array(
+				'selector' => 'downloadModal',
+				'icon'     => 'download',
+				'text'     => JText::_('JTOOLBAR_EXPORT'),
+			)
+		);
+
+		$bar->appendButton('Custom', $dhtml, 'download');
 
 		if ($canDo->get('core.delete'))
 		{
diff --git a/administrator/templates/hathor/html/com_banners/download/default.php b/administrator/templates/hathor/html/com_banners/download/default.php
new file mode 100644
index 0000000000000..22fdafc1f6a37
--- /dev/null
+++ b/administrator/templates/hathor/html/com_banners/download/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+?>
+<div class="container-popup">
+	<form
+		class="form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		method="post">
+
+		<fieldset class="adminform">
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset() as $field) : ?>
+					<li>
+						<?php echo $this->form->getLabel($field->fieldname); ?>
+						<?php echo $this->form->getInput($field->fieldname); ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>
diff --git a/administrator/templates/hathor/html/com_banners/tracks/default.php b/administrator/templates/hathor/html/com_banners/tracks/default.php
index fc11820122862..71c66eb22fcaf 100644
--- a/administrator/templates/hathor/html/com_banners/tracks/default.php
+++ b/administrator/templates/hathor/html/com_banners/tracks/default.php
@@ -19,112 +19,131 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
+<form id="adminForm" name="adminForm" action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post">
 <?php if (!empty( $this->sidebar)) : ?>
-	<div id="j-sidebar-container" class="span2">
+	<div class="span2" id="j-sidebar-container">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div class="span10" id="j-main-container">
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>
-	<fieldset id="filter-bar">
-	<legend class="element-invisible"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></legend>
-		<div class="filter-search">
-			<label class="filter-hide-lbl" for="filter_begin"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></label>
-			<?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10));?>
-
-			<label class="filter-hide-lbl" for="filter_end"><?php echo JText::_('COM_BANNERS_END_LABEL'); ?></label>
-			<?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10));?>
-		</div>
-
-		<div class="filter-select">
-            <label class="selectlabel" for="filter_client_id">
-				<?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
-			</label>
-			<select name="filter_client_id" id="filter_client_id">
-				<option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
-				<?php echo JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
-			</select>
-
-			<label class="selectlabel" for="filter_category_id">
-				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
-			</label>
-			<?php $category = $this->state->get('filter.category_id');?>
-			<select name="filter_category_id" id="filter_category_id">
-				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
-				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $category);?>
-			</select>
-
-			<label class="selectlabel" for="filter_type">
-				<?php echo JText::_('BANNERS_SELECT_TYPE'); ?>
-			</label>
-			<select name="filter_type" id="filter_type">
-				<?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
-			</select>
-
-			<button type="submit" id="filter-go">
-				<?php echo JText::_('JSUBMIT'); ?></button>
-		</div>
-	</fieldset>
-	<div class="clr"> </div>
-
-	<table class="adminlist">
-		<thead>
-			<tr>
-				<th class="title">
-					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
-				</th>
-				<th class="nowrap width-20">
-					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
-				</th>
-				<th class="width-20">
-					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
-				</th>
-				<th class="nowrap width-10">
-					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_TYPE', 'track_type', $listDirn, $listOrder); ?>
-				</th>
-				<th class="nowrap width-10">
-					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_COUNT', 'count', $listDirn, $listOrder); ?>
-				</th>
-				<th class="nowrap width-10">
-					<?php echo JHtml::_('grid.sort', 'JDATE', 'track_date', $listDirn, $listOrder); ?>
-				</th>
-			</tr>
-		</thead>
-
-		<tbody>
-		<?php foreach ($this->items as $i => $item) :?>
-			<tr class="row<?php echo $i % 2; ?>">
-				<td>
-					<?php echo $item->banner_name;?>
-				</td>
-				<td>
-					<?php echo $item->client_name;?>
-				</td>
-				<td>
-					<?php echo $item->category_title;?>
-				</td>
-				<td>
-					<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?>
-				</td>
-				<td>
-					<?php echo $item->count;?>
-				</td>
-				<td>
-					<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4').' H:i');?>
-				</td>
-			</tr>
-		<?php endforeach; ?>
-		</tbody>
-	</table>
-
-	<?php echo $this->pagination->getListFooter(); ?>
-
-	<input type="hidden" name="task" value="" />
-	<input type="hidden" name="boxchecked" value="0" />
-	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
-	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-	<?php echo JHtml::_('form.token'); ?>
-</div>
+
+		<fieldset id="filter-bar">
+			<legend class="element-invisible"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></legend>
+			<div class="filter-search">
+				<label class="filter-hide-lbl" for="filter_begin"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></label>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10));?>
+
+				<label class="filter-hide-lbl" for="filter_end"><?php echo JText::_('COM_BANNERS_END_LABEL'); ?></label>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10));?>
+			</div>
+
+			<div class="filter-select">
+				<label class="selectlabel" for="filter_client_id">
+					<?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
+				</label>
+				<select id="filter_client_id" name="filter_client_id">
+					<option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+					<?php echo JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+				</select>
+
+				<label class="selectlabel" for="filter_category_id">
+					<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+				</label>
+				<?php $category = $this->state->get('filter.category_id');?>
+				<select id="filter_category_id" name="filter_category_id">
+					<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $category);?>
+				</select>
+
+				<label class="selectlabel" for="filter_type">
+					<?php echo JText::_('BANNERS_SELECT_TYPE'); ?>
+				</label>
+				<select id="filter_type" name="filter_type">
+					<?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
+				</select>
+
+				<button id="filter-go" type="submit"><?php echo JText::_('JSUBMIT'); ?></button>
+			</div>
+		</fieldset>
+
+		<div class="clr"> </div>
+
+		<table class="adminlist">
+			<thead>
+				<tr>
+					<th class="title">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-20">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
+					</th>
+					<th class="width-20">
+						<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_TYPE', 'track_type', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_COUNT', 'count', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'JDATE', 'track_date', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td>
+						<?php echo $item->banner_name;?>
+					</td>
+					<td>
+						<?php echo $item->client_name;?>
+					</td>
+					<td>
+						<?php echo $item->category_title;?>
+					</td>
+					<td>
+						<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?>
+					</td>
+					<td>
+						<?php echo $item->count;?>
+					</td>
+					<td>
+						<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4').' H:i');?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+
+		<?php // Load the export form ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'downloadModal',
+			array(
+				'title'       => JText::_('COM_BANNERS_TRACKS_DOWNLOAD'),
+				'url'         => JRoute::_('index.php?option=com_banners&amp;view=download&amp;tmpl=component'),
+				'width'       => '100%',
+				'height'      => '300px',
+				'footer'      => '<button class="btn" data-dismiss="modal" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_("COM_BANNERS_CANCEL") . '</button>'
+						. '<button class="btn btn-success" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+						. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
+			)
+		); ?>
+
+		<?php echo $this->pagination->getListFooter(); ?>
+
+		<input name="task" type="hidden" value="" />
+		<input name="boxchecked" type="hidden" value="0" />
+		<input name="filter_order" type="hidden" value="<?php echo $listOrder; ?>" />
+		<input name="filter_order_Dir" type="hidden" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
 </form>
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php
new file mode 100644
index 0000000000000..ea677551e05cf
--- /dev/null
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+
+$selector = $displayData['selector'];
+$class    = isset($displayData['class']) ? $displayData['class'] : 'toolbar';
+$icon     = isset($displayData['icon']) ? $displayData['icon'] : '';
+$text     = isset($displayData['text']) ? $displayData['text'] : '';
+?>
+<a class="<?php echo $class; ?>" data-toggle="modal" data-target="#<?php echo $selector; ?>">
+	<span class="icon-32-<?php echo $icon; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/layouts/joomla/toolbar/modal.php b/layouts/joomla/toolbar/modal.php
new file mode 100644
index 0000000000000..719e2d0937c90
--- /dev/null
+++ b/layouts/joomla/toolbar/modal.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+/**
+ * Generic toolbar button layout to open a modal
+ * -----------------------------------------------
+ * @param   array   $displayData    Button parameters. Default supported parameters:
+ *                                  - selector  string  Unique DOM identifier for the modal. CSS id without #
+ *                                  - class     string  Button class
+ *                                  - icon      string  Button icon
+ *                                  - text      string  Button text
+ */
+
+$selector = $displayData['selector'];
+$class    = isset($displayData['class']) ? $displayData['class'] : 'btn btn-small';
+$icon     = isset($displayData['icon']) ? $displayData['icon'] : 'out-3';
+$text     = isset($displayData['text']) ? $displayData['text'] : '';
+?>
+<button class="<?php echo $class; ?>" data-toggle="modal" data-target="#<?php echo $selector; ?>">
+	<span class="icon-<?php echo $icon; ?>"></span>
+	<?php echo $text; ?>
+</button>