diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index 93fb18f235..34d9e4b09e 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -145,9 +145,11 @@ function AddFilterModal(props: {
     }
 
     criteriaSelect = <div>
-      <h3>{t('Criteria', {ns: 'dataquery'})}</h3>
+      <h4 style={{color: '#003d68', fontWeight: 'normal'}}>
+        {t('Criteria', {ns: 'dataquery'})}
+      </h4>
       <div style={{display: 'flex'}}>
-        <div style={{width: '20%'}}>
+        <div style={{width: '40%'}}>
           <FilterableSelectGroup groups={
             {'Operators': getOperatorOptions(fieldDictionary, t)}
           }
@@ -157,7 +159,7 @@ function AddFilterModal(props: {
           placeholder={t('Select an operator', {ns: 'dataquery'})}
           />
         </div>
-        <div style={{width: '80%'}}>{valueSelect}</div>
+        <div style={{width: '60%'}}>{valueSelect}</div>
       </div>
     </div>;
 
@@ -282,13 +284,14 @@ function AddFilterModal(props: {
     }
     );
   return (
-    <Modal title={t('Add criteria', {ns: 'dataquery'})}
-      show={true}
-      throwWarning={true}
-      onClose={props.closeModal}
-      onSubmit={submitPromise}>
+    <Modal title={<span style={{color: '#003d68'}}>
+      {t('Add Condition', {ns: 'dataquery'})}
+    </span>}
+    show={true}
+    throwWarning={true}
+    onClose={props.closeModal}
+    onSubmit={submitPromise}>
       <div style={{width: '100%', padding: '1em'}}>
-        <h3>{t('Field', {ns: 'dataquery', count: 1})}</h3>
         <div style={{display: 'flex', width: '100%'}}>
           <div style={{width: '40%'}}>
             <FilterableSelectGroup
@@ -304,7 +307,7 @@ function AddFilterModal(props: {
               }}
             />
           </div>
-          <div style={{width: '100%'}}>
+          <div style={{width: '60%'}}>
             {fieldSelect}
           </div>
         </div>
diff --git a/modules/dataquery/locale/dataquery.pot b/modules/dataquery/locale/dataquery.pot
index 165db07949..eb2f8e18d2 100644
--- a/modules/dataquery/locale/dataquery.pot
+++ b/modules/dataquery/locale/dataquery.pot
@@ -250,9 +250,6 @@ msgstr ""
 msgid "No visits selected for criteria."
 msgstr ""
 
-msgid "Add criteria"
-msgstr ""
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] ""
diff --git a/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
index d35352d9f9..526a289281 100644
--- a/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
@@ -373,9 +373,6 @@ msgstr "Visites non valides"
 msgid "No visits selected for criteria."
 msgstr "Aucune visite sélectionnée pour ces critères."
 
-msgid "Add criteria"
-msgstr "Ajouter critère"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "Champ"
diff --git a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
index 11b88ab4ad..d4fc90fe0d 100644
--- a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
@@ -256,9 +256,6 @@ msgstr "अमान्य विज़िट"
 msgid "No visits selected for criteria."
 msgstr "मानदंड के लिए कोई विज़िट चयनित नहीं है।"
 
-msgid "Add criteria"
-msgstr "मानदंड जोड़ें"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "फ़ील्ड"
diff --git a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
index d1374b635a..cbf973efa0 100644
--- a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
@@ -259,9 +259,6 @@ msgstr "無効な訪問"
 msgid "No visits selected for criteria."
 msgstr "基準に該当する訪問が選択されていません。"
 
-msgid "Add criteria"
-msgstr "条件を追加する"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "分野"