diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
index 508b1cc..021d320 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@@ -85,7 +85,7 @@ $sortFields    = $this->getSortFields();
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-no-items">
-				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				<?php echo \JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
 			<table class="table table-striped">
@@ -113,7 +113,7 @@ $sortFields    = $this->getSortFields();
 				</thead>
 				<tfoot>
 					<tr>
-						<td colspan="7">
+						<td colspan="6">
 						</td>
 					</tr>
 				</tfoot>
diff --git a/administrator/templates/hathor/html/com_patchtester/pulls/default.php b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
index 0a4a51a..7a86cd5 100644
--- a/administrator/templates/hathor/html/com_patchtester/pulls/default.php
+++ b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
@@ -30,29 +30,31 @@ $sortFields    = $this->getSortFields();
 	"
 );
 
-JFactory::getDocument()->addStyleDeclaration(
+\JFactory::getDocument()->addStyleDeclaration(
 	'
 	.icon-48-patchtester { background-image:url("/media/com_patchtester/images/icon-48-patchtester.png"); }
 	'
 );
-echo JHtmlBootstrap::renderModal(
-	'modal-refresh', array(
-		'url' => JUri::root() . 'administrator/index.php?option=com_patchtester&view=fetch&tmpl=component',
-		'title' => JText::_('COM_PATCHTESTER_TOOLBAR_FETCH_DATA'),
+echo \JHtml::_(
+	'bootstrap.renderModal',
+	'modal-refresh',
+	array(
+		'url' => \JUri::root() . 'administrator/index.php?option=com_patchtester&view=fetch&tmpl=component',
+		'title' => \JText::_('COM_PATCHTESTER_TOOLBAR_FETCH_DATA'),
 		'width' => '800px',
 		'height' => '300px'
 	)
 );
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo \JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-main-container">
 		<fieldset id="filter-bar">
-			<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+			<legend class="element-invisible"><?php echo \JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
 			<div class="filter-search">
 				<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
-				<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>" />
-				<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
-				<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo \JText::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>" />
+				<button type="submit" class="btn"><?php echo \JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+				<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo \JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
 			</div>
 			<div class="filter-select">
 				<label class="selectlabel" for="filter_applied"><?php echo JText::_('COM_PATCHTESTER_FILTER_APPLIED_PATCHES'); ?></label>
@@ -61,7 +63,7 @@ echo JHtmlBootstrap::renderModal(
 					<option value="yes"<?php if ($filterApplied == 'yes') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_APPLIED'); ?></option>
 					<option value="no"<?php if ($filterApplied == 'no') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_NOT_APPLIED'); ?></option>
 				</select>
-				<button type="submit" id="filter-go"><?php echo JText::_('JSUBMIT'); ?></button>
+				<button type="submit" id="filter-go"><?php echo \JText::_('JSUBMIT'); ?></button>
 			</div>
 		</fieldset>
 		<div class="clr"> </div>
@@ -70,10 +72,10 @@ echo JHtmlBootstrap::renderModal(
 			<thead>
 			<tr>
 				<th width="5%" class="nowrap center">
-					<?php echo JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'a.pull_id', $listDirn, $listOrder); ?>
+					<?php echo \JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'a.pull_id', $listDirn, $listOrder); ?>
 				</th>
 				<th class="nowrap">
-					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					<?php echo \JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 				</th>
 				<th width="8%" class="nowrap center">
 					<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
@@ -82,7 +84,7 @@ echo JHtmlBootstrap::renderModal(
 					<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
 				</th>
 				<th width="10%" class="nowrap center">
-					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'applied', $listDirn, $listOrder); ?>
+					<?php echo \JHtml::_('grid.sort', 'JSTATUS', 'applied', $listDirn, $listOrder); ?>
 				</th>
 				<th width="15%" class="nowrap center">
 					<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
@@ -106,7 +108,7 @@ echo JHtmlBootstrap::renderModal(
 		<input type="hidden" name="pull_id" id="pull_id" value="" />
 		<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'); ?>
+		<?php echo \JHtml::_('form.token'); ?>
 	</div>
 </form>
 <?php endif;