diff --git a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
index 2007f9e..8c2aeca 100644
--- a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
+++ b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
@@ -11,38 +11,26 @@
 
 defined('_JEXEC') or die('Restricted access');
 
-// Load Joomla framework
-if (version_compare(JVERSION, '3.3.0', '>='))
-{
-	JHtml::_('behavior.core');
-}
-else
-{
-	JHtml::_('behavior.framework', true);
-}
-
 // Load jQuery
 JHtml::_('jquery.framework');
 
-$cssSuffix = JDEBUG ? '.css' : '.min.css';
-
 // Load Bootstrap
 if (version_compare(JVERSION, '4.0', '>='))
 {
 	JHtml::_('bootstrap.collapse');
 	JHtml::_('bootstrap.tab');
 
-  // Tooltips are used by JAMSS reports
+  	// Tooltips are used by JAMSS reports
 	JHtml::_('bootstrap.tooltip');
 }
 else
 {
-	JHtml::stylesheet('media/com_jedchecker/css/j4-style' . $cssSuffix);
-	JHtml::script('media/com_jedchecker/js/bootstrap.bundle.min.js');
+	JHtml::_('stylesheet', 'com_jedchecker/j4-style.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('script', 'com_jedchecker/bootstrap.bundle.min.js', array('version' => 'auto', 'relative' => true), array('defer' => true));
 }
 
-JHtml::stylesheet('media/com_jedchecker/css/style' . $cssSuffix);
-JHtml::script('media/com_jedchecker/js/script.js');
+JHtml::_('stylesheet', 'com_jedchecker/style.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'com_jedchecker/script.js', array('version' => 'auto', 'relative' => true), array('defer' => true));
 ?>
 <script id="jed-rules-json" type="application/json"><?php echo json_encode($this->jsOptions); ?></script>
 <div id="jedchecker">
@@ -72,8 +60,7 @@ JHtml::script('media/com_jedchecker/js/script.js');
 							<input type="file" class="form-control" name="extension" id="extension" required
 									accept=".bz2,.bzip2,.gz,.gzip,.tar,.tbz2,.tgz,.zip"
 									aria-describedby="extension-upload" aria-label="<?php echo JText::_('COM_JEDCHECKER_UPLOAD_FILE'); ?>">
-							<button class="btn btn-success" type="button" id="extension-upload"
-									onclick="add_validation(); jQuery('#jed_uploading_spinner').removeClass('hidden'); Joomla.submitbutton('uploads.upload')">
+							<button class="btn btn-success" type="button" id="extension-upload">
 								<span class="icon-upload "></span> <?php echo JText::_('JSUBMIT'); ?>
 							</button>
 							<div class="invalid-feedback"><?php echo JText::_('COM_JEDCHECKER_EMPTY_UPLOAD_FIELD'); ?></div>