diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php
index ff3da4862235f..ab45cb2e75786 100644
--- a/administrator/components/com_modules/tmpl/module/edit_assignment.php
+++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php
@@ -31,25 +31,33 @@
 </div>
 <div id="menuselect-group" class="control-group">
 	<label id="jform_menuselect-lbl" class="control-label" for="jform_menuselect"><?php echo Text::_('JGLOBAL_MENU_SELECTION'); ?></label>
-
 	<div id="jform_menuselect" class="controls">
 		<?php if (!empty($menuTypes)) : ?>
-		<?php $id = 'jform_menuselect'; ?>
 
 		<div class="card card-secondary">
 			<div class="card-header">
-				<span class="small"><?php echo Text::_('JSELECT'); ?>:
-					<a id="treeCheckAll" href="javascript://"><?php echo Text::_('JALL'); ?></a>,
-					<a id="treeUncheckAll" href="javascript://"><?php echo Text::_('JNONE'); ?></a>
-				</span>
-				<span class="width-20">|</span>
-				<span class="small"><?php echo Text::_('COM_MODULES_EXPAND'); ?>:
-					<a id="treeExpandAll" href="javascript://"><?php echo Text::_('JALL'); ?></a>,
-					<a id="treeCollapseAll" href="javascript://"><?php echo Text::_('JNONE'); ?></a>
-				</span>
-				<input type="text" id="treeselectfilter" name="treeselectfilter" class="form-control search-query"
-					autocomplete="off" placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>"
-					aria-invalid="false" aria-label="<?php echo Text::_('JSEARCH_FILTER'); ?>">
+				<section class="d-flex align-items-center flex-wrap w-100" aria-label="<?php echo Text::_('COM_MODULES_GLOBAL'); ?>">
+					<div class="d-flex align-items-center flex-fill mb-1" role="group" aria-label="<?php echo Text::_('COM_MODULES_GLOBAL_ASSIGN'); ?>"><?php echo Text::_('COM_MODULES_GLOBAL_ASSIGN'); ?>
+						<button id="treeCheckAll" class="btn btn-secondary btn-sm mx-1" type="button">
+							<?php echo Text::_('JALL'); ?>
+						</button>
+						<button id="treeUncheckAll" class="btn btn-secondary btn-sm mx-1" type="button">
+							<?php echo Text::_('JNONE'); ?>
+						</button>
+					</div>
+					<div class="d-flex align-items-center mb-1 flex-fill" role="group" aria-label="<?php echo Text::_('COM_MODULES_GLOBAL_TREE_EXPAND'); ?>"><?php echo Text::_('COM_MODULES_GLOBAL_TREE_EXPAND'); ?>
+						<button id="treeExpandAll" class="btn btn-secondary btn-sm mx-1" type="button">
+							<?php echo Text::_('JALL'); ?>
+						</button>
+						<button id="treeCollapseAll" class="btn btn-secondary btn-sm mx-1" type="button">
+							<?php echo Text::_('JNONE'); ?>
+						</button>
+					</div>
+					<div role="search" class="flex-grow-1">
+						<label for="treeselectfilter" class="sr-only"><?php echo Text::_('COM_MODULES_SEARCH_MENUITEM'); ?></label>
+						<input type="text" id="treeselectfilter" name="treeselectfilter" class="form-control search-query" autocomplete="off" placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>">
+					</div>
+				</section>
 			</div>
 			<div class="card-body">
 				<ul class="treeselect">
@@ -86,6 +94,7 @@
 									<div class="treeselect-item">
 										<?php
 										$uselessMenuItem = in_array($link->type, array('separator', 'heading', 'alias', 'url'));
+										$id = 'jform_menuselect';
 										?>
 										<input type="checkbox" class="novalidate" name="jform[assigned][]" id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>"<?php echo $selected ? ' checked="checked"' : ''; echo $uselessMenuItem ? ' disabled="disabled"' : ''; ?>>
 										<label for="<?php echo $id . $link->value; ?>" class="">
@@ -127,7 +136,7 @@
 								<span class="sr-only"><?php echo Text::sprintf('JGLOBAL_TOGGLE_DROPDOWN'); ?></span>
 							</button>
 							<div class="dropdown-menu">
-								<h5 class="dropdown-header"><?php echo Text::_('COM_MODULES_SUBITEMS'); ?></h5>
+								<h1 class="dropdown-header"><?php echo Text::_('COM_MODULES_SUBITEMS'); ?></h1>
 								<div class="dropdown-divider"></div>
 								<a class="dropdown-item checkall" href="javascript://"><span class="fas fa-check-square" aria-hidden="true"></span> <?php echo Text::_('JSELECT'); ?></a>
 								<a class="dropdown-item uncheckall" href="javascript://"><span class="fas fa-square" aria-hidden="true"></span> <?php echo Text::_('COM_MODULES_DESELECT'); ?></a>
diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini
index 1c02e5502aa99..31143e75bade1 100644
--- a/administrator/language/en-GB/com_modules.ini
+++ b/administrator/language/en-GB/com_modules.ini
@@ -56,6 +56,9 @@ COM_MODULES_FIELD_SHOWTITLE_LABEL="Title"
 COM_MODULES_FIELD_VALUE_NOCACHING="No caching"
 COM_MODULES_FILTER_SEARCH_DESC="Filter by position name."
 COM_MODULES_GENERAL_FIELDSET_DESC="Configure module edit interface settings."
+COM_MODULES_GLOBAL="Assigning the Module to Menu Items"
+COM_MODULES_GLOBAL_ASSIGN="Assign to Menu Items"
+COM_MODULES_GLOBAL_TREE_EXPAND="Expand the Menu Subtrees"
 COM_MODULES_HEADING_MODULE="Type"
 COM_MODULES_HEADING_MODULE_ASC="Type ascending"
 COM_MODULES_HEADING_MODULE_DESC="Type descending"
@@ -175,6 +178,7 @@ COM_MODULES_POSITION_USER6="User 6"
 COM_MODULES_POSITION_USER7="User 7"
 COM_MODULES_POSITION_USER8="User 8"
 COM_MODULES_SAVE_SUCCESS="Module saved"
+COM_MODULES_SEARCH_MENUITEM="Search for a Menu Item"
 COM_MODULES_SELECT_MODULE="Select module, %s"
 COM_MODULES_SUBITEMS="Sub-items"
 COM_MODULES_TABLE_CAPTION="Table of Modules"