diff --git a/src/public/app/widgets/search_actions/abstract_search_action.js b/src/public/app/widgets/search_actions/abstract_search_action.js
index 49bcb09c4..3a9f771ee 100644
--- a/src/public/app/widgets/search_actions/abstract_search_action.js
+++ b/src/public/app/widgets/search_actions/abstract_search_action.js
@@ -14,7 +14,9 @@ export default class AbstractSearchAction extends Component {
         try {
             const $rendered = this.doRender();
 
-            $rendered.find('.action-conf-del').on('click', () => this.deleteAction())
+            $rendered.find('.action-conf-del')
+                .on('click', () => this.deleteAction())
+                .attr('title', 'Remove this search action');
 
             return $rendered;
         }
diff --git a/src/public/app/widgets/search_actions/execute_script.js b/src/public/app/widgets/search_actions/execute_script.js
index e7140dbd0..1bd24ec42 100644
--- a/src/public/app/widgets/search_actions/execute_script.js
+++ b/src/public/app/widgets/search_actions/execute_script.js
@@ -12,7 +12,20 @@ const TPL = `
            placeholder="note.title = note.title + '- suffix';"/>
     </td>
     <td class="button-column">
-        <span class="bx bx-x icon-action action-conf-del"></span>
+        <div style="display: flex">
+            <div class="dropdown help-dropdown">
+              <span class="bx bx-help-circle icon-action" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
+              <div class="dropdown-menu dropdown-menu-right p-4">
+                You can execute simple scripts on the matched notes.
+                
+                For example to append a string to a note's title, use this small script:
+                
+                <pre>note.title = note.title + ' - suffix';</pre>
+              </div>
+            </div>
+        
+            <span class="bx bx-x icon-action action-conf-del"></span>
+        </div>
     </td>
 </tr>`;
 
diff --git a/src/public/app/widgets/search_actions/rename_label.js b/src/public/app/widgets/search_actions/rename_label.js
index 9ab6930de..b61364c62 100644
--- a/src/public/app/widgets/search_actions/rename_label.js
+++ b/src/public/app/widgets/search_actions/rename_label.js
@@ -5,23 +5,21 @@ const TPL = `
 <tr>
     <td colspan="2">
         <div style="display: flex; align-items: center">
-            <div style="display: flex; align-items: center">
-                <div style="margin-right: 15px;">Rename label from:</div> 
-                
-                <input type="text" 
-                    class="form-control old-label-name" 
-                    placeholder="old name" 
-                    pattern="[\\p{L}\\p{N}_:]+"
-                    title="Alphanumeric characters, underscore and colon are allowed characters."/>
-                
-                <div style="margin-right: 15px; margin-left: 15px;">To:</div> 
-                
-                <input type="text" 
-                    class="form-control new-label-name" 
-                    placeholder="new name"
-                    pattern="[\\p{L}\\p{N}_:]+"
-                    title="Alphanumeric characters, underscore and colon are allowed characters."/>
-            </div>
+            <div style="margin-right: 10px;">Rename label from:</div> 
+            
+            <input type="text" 
+                class="form-control old-label-name" 
+                placeholder="old name" 
+                pattern="[\\p{L}\\p{N}_:]+"
+                title="Alphanumeric characters, underscore and colon are allowed characters."/>
+            
+            <div style="margin-right: 10px; margin-left: 10px;">To:</div> 
+            
+            <input type="text" 
+                class="form-control new-label-name" 
+                placeholder="new name"
+                pattern="[\\p{L}\\p{N}_:]+"
+                title="Alphanumeric characters, underscore and colon are allowed characters."/>
         </div>
     </td>
     <td class="button-column">
diff --git a/src/public/app/widgets/search_actions/rename_relation.js b/src/public/app/widgets/search_actions/rename_relation.js
index 152d996a3..0e4d36248 100644
--- a/src/public/app/widgets/search_actions/rename_relation.js
+++ b/src/public/app/widgets/search_actions/rename_relation.js
@@ -5,23 +5,21 @@ const TPL = `
 <tr>
     <td colspan="2">
         <div style="display: flex; align-items: center">
-            <div style="display: flex; align-items: center">
-                <div style="margin-right: 15px;">Rename relation from:</div> 
-                
-                <input type="text" 
-                    class="form-control old-relation-name" 
-                    placeholder="old name" 
-                    pattern="[\\p{L}\\p{N}_:]+"
-                    title="Alphanumeric characters, underscore and colon are allowed characters."/>
-                
-                <div style="margin-right: 15px; margin-left: 15px;">To:</div> 
-                
-                <input type="text" 
-                    class="form-control new-relation-name" 
-                    placeholder="new name"
-                    pattern="[\\p{L}\\p{N}_:]+"
-                    title="Alphanumeric characters, underscore and colon are allowed characters."/>
-            </div>
+            <div style="margin-right: 10px;">Rename relation from:</div> 
+            
+            <input type="text" 
+                class="form-control old-relation-name" 
+                placeholder="old name" 
+                pattern="[\\p{L}\\p{N}_:]+"
+                title="Alphanumeric characters, underscore and colon are allowed characters."/>
+            
+            <div style="margin-right: 10px; margin-left: 10px;">To:</div> 
+            
+            <input type="text" 
+                class="form-control new-relation-name" 
+                placeholder="new name"
+                pattern="[\\p{L}\\p{N}_:]+"
+                title="Alphanumeric characters, underscore and colon are allowed characters."/>
         </div>
     </td>
     <td class="button-column">
diff --git a/src/public/app/widgets/search_actions/set_label_value.js b/src/public/app/widgets/search_actions/set_label_value.js
index 0c04a0472..f5dcf0bd1 100644
--- a/src/public/app/widgets/search_actions/set_label_value.js
+++ b/src/public/app/widgets/search_actions/set_label_value.js
@@ -5,19 +5,17 @@ const TPL = `
 <tr>
     <td colspan="2">
         <div style="display: flex; align-items: center">
-            <div style="display: flex; align-items: center">
-                <div style="margin-right: 15px;" class="text-nowrap">Set label</div> 
-                
-                <input type="text" 
-                    class="form-control label-name" 
-                    placeholder="label name"
-                    pattern="[\\p{L}\\p{N}_:]+"
-                    title="Alphanumeric characters, underscore and colon are allowed characters."/>
-                
-                <div style="margin-right: 15px; margin-left: 15px;" class="text-nowrap">to value</div>
-                
-                <input type="text" class="form-control label-value" placeholder="new value"/>
-            </div>
+            <div style="margin-right: 10px;" class="text-nowrap">Set label</div> 
+            
+            <input type="text" 
+                class="form-control label-name" 
+                placeholder="label name"
+                pattern="[\\p{L}\\p{N}_:]+"
+                title="Alphanumeric characters, underscore and colon are allowed characters."/>
+            
+            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">to value</div>
+            
+            <input type="text" class="form-control label-value" placeholder="new value"/>
         </div>
     </td>
     <td class="button-column">
diff --git a/src/public/app/widgets/search_actions/set_relation_target.js b/src/public/app/widgets/search_actions/set_relation_target.js
index d80b6d8ae..2aef693b4 100644
--- a/src/public/app/widgets/search_actions/set_relation_target.js
+++ b/src/public/app/widgets/search_actions/set_relation_target.js
@@ -6,18 +6,20 @@ const TPL = `
 <tr>
     <td colspan="2">
         <div style="display: flex; align-items: center">
-            <div style="margin-right: 15px;" class="text-nowrap">Set relation</div> 
+            <div style="margin-right: 10px;" class="text-nowrap">Set relation</div> 
             
             <input type="text" 
                 class="form-control relation-name" 
                 placeholder="relation name"
                 pattern="[\\p{L}\\p{N}_:]+"
+                style="flex-shrink: 3"
                 title="Alphanumeric characters, underscore and colon are allowed characters."/>
-        </div>
-        <div style="display: flex; align-items: center; margin-top: 10px;">
-            <div style="margin-right: 15px;" class="text-nowrap">target to note</div>
+                
+            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">to</div>
             
-            <input type="text" class="form-control target-note"/>
+            <div class="input-group" style="flex-shrink: 2">
+                <input type="text" class="form-control target-note" placeholder="target note"/>
+            </div>
         </div>
     </td>
     <td class="button-column">
diff --git a/src/public/app/widgets/search_definition.js b/src/public/app/widgets/search_definition.js
index 778dbd470..431640128 100644
--- a/src/public/app/widgets/search_definition.js
+++ b/src/public/app/widgets/search_definition.js
@@ -30,6 +30,10 @@ const TPL = `
         border-spacing: 10px;
     }
     
+    .search-setting-table div {
+        white-space: nowrap;
+    }
+    
     .search-setting-table .button-column {
         /* minimal width so that table remains static sized and most space remains for middle column with settings */
         width: 50px;
diff --git a/src/public/app/widgets/search_options/abstract_search_option.js b/src/public/app/widgets/search_options/abstract_search_option.js
index 0d6069d84..9dab8ae88 100644
--- a/src/public/app/widgets/search_options/abstract_search_option.js
+++ b/src/public/app/widgets/search_options/abstract_search_option.js
@@ -24,7 +24,9 @@ export default class AbstractSearchOption extends Component {
         try {
             const $rendered = this.doRender();
 
-            $rendered.find('.search-option-del').on('click', () => this.deleteOption())
+            $rendered.find('.search-option-del')
+                .on('click', () => this.deleteOption())
+                .attr('title', 'Remove this search option');
 
             return $rendered;
         }
diff --git a/src/public/app/widgets/search_options/search_string.js b/src/public/app/widgets/search_options/search_string.js
index 43b2149e1..a895934c8 100644
--- a/src/public/app/widgets/search_options/search_string.js
+++ b/src/public/app/widgets/search_options/search_string.js
@@ -12,7 +12,7 @@ const TPL = `
     <td class="button-column">
         <div class="dropdown help-dropdown">
           <span class="bx bx-help-circle icon-action" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-          <div class="dropdown-menu dropdown-menu-right p-4" style="width: 500px;">
+          <div class="dropdown-menu dropdown-menu-right p-4">
             <strong>Search syntax</strong> - also see <button class="btn btn-sm" type="button" data-help-page="Search">complete help on search syntax</button>
             <p>
             <ul>
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index acae9be99..f1d686e98 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -935,4 +935,11 @@ ul.fancytree-container li {
     border-width: 2px;
     box-shadow: 10px 10px 93px -25px black;
     padding: 10px 15px 10px 15px !important;
+    width: 500px;
+}
+
+.help-dropdown .dropdown-menu pre {
+    background-color: var(--accented-background-color);
+    padding: 10px;
+    margin: 10px;
 }