diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php
index b825873..7ea45ae 100644
--- a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php
+++ b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php
@@ -13,14 +13,14 @@ use Joomla\CMS\Layout\LayoutHelper;
 $published = $this->state->get('filter.published');
 ?>
 
-<div class="container-fluid">
-	<div class="row-fluid">
-		<div class="control-group span6">
+<div class="p-3">
+	<div class="row">
+		<div class="form-group col-md-6">
 			<div class="controls">
 				<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
 			</div>
 		</div>
-		<div class="control-group span6">
+		<div class="form-group col-md-6">
 			<div class="controls">
 				<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
 			</div>
@@ -28,13 +28,13 @@ $published = $this->state->get('filter.published');
 	</div>
 	<div class="row-fluid">
 		<?php if ($published >= 0) : ?>
-			<div class="control-group span6">
+			<div class="form-group col-md-6">
 				<div class="controls">
 					<?php echo LayoutHelper::render('joomla.html.batch.item', ['extension' => 'com_weblinks']); ?>
 				</div>
 			</div>
 		<?php endif; ?>
-		<div class="control-group span6">
+		<div class="form-group col-md-6">
 			<div class="controls">
 				<?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
 			</div>
diff --git a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php
index 631cd6c..da94bfd 100644
--- a/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php
+++ b/src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php
@@ -9,11 +9,10 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
-
 ?>
-<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
 	<?php echo Text::_('JCANCEL'); ?>
-</a>
-<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('weblink.batch');">
+</button>
+<button type="submit" id='batch-submit-button-id' class="btn btn-success" data-submit-task='weblink.batch'>
 	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>
\ No newline at end of file
+</button>