diff --git a/module/custom/control.php b/module/custom/control.php
index a5e5aea3b4..0e51a8322d 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -652,6 +652,7 @@ class custom extends control
         $this->view->disabledFeatures      = $disabledFeatures;
         $this->view->enabledScrumFeatures  = $enabledScrumFeatures;
         $this->view->disabledScrumFeatures = $disabledScrumFeatures;
+        $this->view->currentModeTips       = sprintf($this->lang->custom->currentModeTips, $this->lang->custom->modeList[$mode], $this->lang->custom->modeList[$mode == 'light' ? 'ALM' : 'light']);
 
         $this->display();
     }
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index 66f9547cdd..3f9f1c39e5 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -20,7 +20,7 @@
       <h2><?php echo $lang->custom->modeManagement;?></h2>
     </div>
     <div class='main-table'>
-      <p class='strong'><?php echo sprintf($lang->custom->currentModeTips, $lang->custom->modeList[$mode], $lang->custom->modeList[$mode == 'light' ? 'ALM' : 'light']);?> </p>
+      <p class='strong'><?php echo $currentModeTips;?></p>
       <table class='table table-bordered'>
         <thead>
           <tr>
@@ -55,15 +55,15 @@
           <?php endforeach;?>
           <tr class='text-center select-mode'>
             <td class='text-left strong'><?php echo $this->lang->custom->selectUsage;?></td>
-            <td>
-              <?php $primaryClass = $mode == 'light' ? '' : 'btn-primary';?>
-              <?php $disabled     = $mode == 'light' ? 'disabled' : '';?>
-              <?php echo html::commonButton($lang->custom->useLight, "id='useLight' data-mode='light' $disabled", "btn btn-wide $primaryClass");?>
+            <?php $title = $mode == 'light' ? "title='{$currentModeTips}'" : '';?>
+            <td <?php echo $title;?>>
+              <?php $disabled = $mode == 'light' ? 'disabled' : '';?>
+              <?php echo html::commonButton($lang->custom->useLight, "id='useLight' data-mode='light' $disabled", "btn btn-wide btn-primary");?>
             </td>
-            <td>
-              <?php $primaryClass = $mode == 'ALM' ? '' : 'btn-primary';?>
-              <?php $disabled     = $mode == 'ALM' ? 'disabled' : '';?>
-              <?php echo html::commonButton($lang->custom->useALM, "id='useALM' data-mode='ALM' $disabled", "btn btn-wide $primaryClass");?>
+            <?php $title = $mode == 'ALM' ? "title='{$currentModeTips}'" : '';?>
+            <td <?php echo $title;?>>
+              <?php $disabled = $mode == 'ALM' ? 'disabled' : '';?>
+              <?php echo html::commonButton($lang->custom->useALM, "id='useALM' data-mode='ALM' $disabled", "btn btn-wide btn-primary");?>
               <?php echo html::hidden('mode', $mode);?>
             </td>
           </tr>
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index a56eadb6fe..ed7d7ac161 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -105,7 +105,7 @@
         <th class='text-right text-top'><?php echo $lang->group->dynamic?></th>
         <td class='pl-0px pt-0px'>
           <table class='table table-form'>
-            <?php foreach($lang->mainNav as $module => $title):?>
+            <?php a($lang->mainNav);foreach($lang->mainNav as $module => $title):?>
             <?php if(!is_string($title)) continue;?>
             <?php
             /* Ignore null actions menus. */
@@ -134,7 +134,7 @@
                 </div>
               </th>
               <td>
-                <?php if(isset($lang->action->dynamicAction->$module)):?>
+                <?php if(isset($lang->action->dynamicAction->$module)): a($lang->action->dynamicAction);?>
                 <div class='clearfix'>
                   <?php foreach($lang->action->dynamicAction->$module as $action => $actionTitle):?>
                   <div class='action-item'>
diff --git a/module/install/css/step4.css b/module/install/css/step4.css
index 3c0ef11fd4..d9f2770656 100644
--- a/module/install/css/step4.css
+++ b/module/install/css/step4.css
@@ -9,6 +9,7 @@
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
 .btn-wide {padding: 6px 85px;}
+#useLight:hover, #useALM:hover{color: #fff; background-color: #2e7fff; border-color: transparent;}
 
 #mainContent .datatable {cursor: default;}
 .container {padding-top: 20px;}
diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css
index 58be2531bd..275fda0bfa 100644
--- a/module/upgrade/css/to18guide.css
+++ b/module/upgrade/css/to18guide.css
@@ -10,6 +10,7 @@
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
 .btn-wide {padding: 6px 85px;}
+#useLight:hover, #useALM:hover{color: #fff; background-color: #2e7fff; border-color: transparent;}
 
 #mainContent .datatable {cursor: default;}
 .container {padding-top: 20px;}