diff --git a/jsx/Form.d.ts b/jsx/Form.d.ts
index 8c9ecd596c1..babd4a78d06 100644
--- a/jsx/Form.d.ts
+++ b/jsx/Form.d.ts
@@ -162,6 +162,7 @@ type checkboxProps = {
     required?: boolean
     errorMessage?: string
     elementClass?: string
+    style?: object
     onUserInput?: (name: string, value: any) => void
 }
 /**
diff --git a/jsx/Form.js b/jsx/Form.js
index e1495877f8b..8ca7b01aa80 100644
--- a/jsx/Form.js
+++ b/jsx/Form.js
@@ -2187,7 +2187,9 @@ export class CheckboxElement extends React.Component {
     let elementClass = this.props.class + ' ' + this.props.offset;
     const divStyle = this.props.class === 'checkbox-inline'
       ? {paddingRight: '5px'}
-      : {paddingRight: '5px', display: 'inline-block'};
+      : this.props.class === 'checkbox-flex' ?
+        {paddingRight: '5px', display: 'flex'}
+        : {paddingRight: '5px', display: 'inline-block'};
 
     // Add required asterix
     if (this.props.required) {
@@ -2201,9 +2203,12 @@ export class CheckboxElement extends React.Component {
     }
 
     return (
-      <div className={elementClass}>
+      <div className={elementClass} style={this.props.style}>
         <div className="col-sm-12">
-          <label htmlFor={this.props.id}>
+          <label htmlFor={this.props.id}
+            style={
+              this.props.class === 'checkbox-flex'
+                ? {display: 'flex'} : {}}>
             <div style={divStyle}>
               <input
                 type="checkbox"
@@ -2213,6 +2218,9 @@ export class CheckboxElement extends React.Component {
                 required={this.props.required}
                 disabled={this.props.disabled}
                 onChange={this.handleChange}
+                style={
+                  this.props.class === 'checkbox-flex' ? {marginTop: '0'} : {}
+                }
               />
             </div>
             {errorMessage}
@@ -2237,6 +2245,7 @@ CheckboxElement.propTypes = {
   errorMessage: PropTypes.string,
   elementClass: PropTypes.string,
   onUserInput: PropTypes.func,
+  style: PropTypes.object,
 };
 
 CheckboxElement.defaultProps = {
@@ -2247,6 +2256,7 @@ CheckboxElement.defaultProps = {
   offset: 'col-sm-offset-3',
   class: 'checkbox-inline',
   elementClass: 'checkbox-inline col-sm-offset-3',
+  style: {},
   onUserInput: function() {
     console.warn('onUserInput() callback is not set');
   },
diff --git a/modules/dataquery/jsx/components/filterableselectgroup.tsx b/modules/dataquery/jsx/components/filterableselectgroup.tsx
index a1ad85b5200..82266fdac53 100644
--- a/modules/dataquery/jsx/components/filterableselectgroup.tsx
+++ b/modules/dataquery/jsx/components/filterableselectgroup.tsx
@@ -20,6 +20,7 @@ type SelectGroup = {
  * @param {string?} props.placeholder - An optional placeholder value when no elements are selected
  * @param {object} props.groups - Groups to select the dropdown into
  * @param {function} props.mapGroupName - A mapper from backend to frontend name for groups
+ * @param {string?} props.label - Select input label
  * @returns {React.ReactElement} - The element
  */
 function FilterableSelectGroup(props: {
@@ -27,6 +28,7 @@ function FilterableSelectGroup(props: {
     placeholder?: string,
     groups: object,
     mapGroupName?: (module: string) => string,
+    label?: string,
 }) {
   const {t} = useTranslation();
   const groups: SelectGroup[] = [];
@@ -73,20 +75,52 @@ function FilterableSelectGroup(props: {
   };
   return (
     <div>
-      <Select options={groups} onChange={selected}
-        noOptionsMessage={() => t('No options', {ns: 'loris'})}
-        menuPortalTarget={document.body}
-        styles={{menuPortal:
-                    /**
-                     * Add a z-index to ensure the element stays visible
-                     *
-                     * @param {object} base - the base CSS
-                     * @returns {object} - the new CSS with z-index added
-                     */
-                    (base) => ({...base, zIndex: 9999})}
-        }
-        placeholder={placeholder}
-      />
+      {props?.label ?
+        <label style={{width: '100%', fontSize: '24px'}}>
+          {props.label}
+          <Select options={groups} onChange={selected}
+            noOptionsMessage={() => t('No options', {ns: 'loris'})}
+            menuPortalTarget={document.body}
+            styles={{menuPortal:
+                        /**
+                         * Add a z-index to ensure the element stays visible
+                         *
+                         * @param {object} base - the base CSS
+                         * @returns {object} - the new CSS with z-index added
+                         */
+                        (base) => ({...base, zIndex: 9999}),
+            valueContainer:
+                            /**
+                             * Adds appropriate zIndex to the react select's base CSS
+                             *
+                             * @param {object} base - The current CSS
+                             * @returns {object} New CSS with z-index added
+                             */
+                            (base) => ({
+                              ...base,
+                              fontSize: '14px',
+                              fontWeight: 400,
+                            }),
+            }}
+            placeholder={placeholder}
+          />
+        </label>
+        : (
+          <Select options={groups} onChange={selected}
+            noOptionsMessage={() => t('No options', {ns: 'loris'})}
+            menuPortalTarget={document.body}
+            styles={{menuPortal:
+                        /**
+                         * Add a z-index to ensure the element stays visible
+                         *
+                         * @param {object} base - the base CSS
+                         * @returns {object} - the new CSS with z-index added
+                         */
+                        (base) => ({...base, zIndex: 9999})}
+            }
+            placeholder={placeholder}
+          />
+        )}
     </div>
   );
 }
diff --git a/modules/dataquery/jsx/definefields.tsx b/modules/dataquery/jsx/definefields.tsx
index 9da0d33cf5e..75d29f0ae2b 100644
--- a/modules/dataquery/jsx/definefields.tsx
+++ b/modules/dataquery/jsx/definefields.tsx
@@ -117,6 +117,18 @@ function QueryField(props: {
                          * @returns {object} New CSS with z-index added
                          */
                         (base) => ({...base, zIndex: 9999}),
+            valueContainer:
+                            /**
+                             * Adds appropriate zIndex to the react select's base CSS
+                             *
+                             * @param {object} base - The current CSS
+                             * @returns {object} New CSS with z-index added
+                             */
+                            (base) => ({
+                              ...base,
+                              maxHeight: '150px',
+                              overflowY: 'auto',
+                            }),
             }
           }
           closeMenuOnSelect={false}
@@ -132,7 +144,8 @@ function QueryField(props: {
       style={{
         cursor: 'pointer',
         display: 'flex',
-        justifyContent: 'space-between',
+        flexDirection: 'column',
+        marginBottom: '4px',
       }}
       onClick={() => props.onFieldToggle(
         props.module,
@@ -141,8 +154,10 @@ function QueryField(props: {
         selectedVisits,
       )}>
       <dl>
-        <dt>{item}</dt>
-        <dd>{value.description} {download}</dd>
+        <dt style={{fontSize: '18px', wordBreak: 'break-word'}}>{item}</dt>
+        <dd
+          style={{wordBreak: 'break-word'}}
+        >{value.description} {download}</dd>
       </dl>
       {visits}
     </div>);
@@ -340,78 +355,112 @@ function DefineFields(props: {
       const selectedVisits = props.defaultVisits.map((el) => {
         return {value: el, label: el};
       });
-      defaultVisits = <div style={{paddingBottom: '1em', display: 'flex'}}>
-        <h4 style={{paddingRight: '1ex'}}>{t('Default Visits',
-          {ns: 'dataquery'})}</h4>
-        <Select options={allVisits}
-          isMulti
-          onChange={props.onChangeDefaultVisits}
-          placeholder={t('Select Visits', {ns: 'dataquery'})}
-          noOptionsMessage={() => t('No options', {ns: 'loris'})}
-          menuPortalTarget={document.body}
-          styles={
-            {menuPortal:
-                            /**
-                             * Adds appropriate zIndex to the react select's base CSS
-                             *
-                             * @param {object} base - The current CSS
-                             * @returns {object} New CSS with z-index added
-                             */
-                            (base) => ({...base, zIndex: 9999}),
-            }
-          }
-          value={selectedVisits}
-          closeMenuOnSelect={false}
-        />
-        <div>
-          <CheckboxElement label={t('Sync with selected fields',
-            {ns: 'dataquery'})}
-          name="syncVisits"
-          value={syncVisits}
-          onUserInput={
-            (name: string, value: boolean) => setSyncVisits(value)
-          } />
+      defaultVisits = <div style={{
+        display: 'flex',
+        flexDirection: 'column',
+        marginBottom: '16px'}}>
+        <div style={{marginBottom: '8px'}}>
+          <CheckboxElement
+            label={t('Sync visit selection across selected fields',
+              {ns: 'dataquery'})}
+            name="syncVisits"
+            class="checkbox-flex"
+            offset=""
+            value={syncVisits}
+            style={{}}
+            onUserInput={
+              (name: string, value: boolean) => setSyncVisits(value)
+            } />
         </div>
+        {syncVisits && <div style={{marginBottom: '16px'}}>
+          <Select options={allVisits}
+            isMulti
+            onChange={props.onChangeDefaultVisits}
+            placeholder={t('Select Visits', {ns: 'dataquery'})}
+            noOptionsMessage={() => t('No options', {ns: 'loris'})}
+            menuPortalTarget={document.body}
+            styles={
+              {menuPortal:
+                              /**
+                               * Adds appropriate zIndex to the react select's base CSS
+                               *
+                               * @param {object} base - The current CSS
+                               * @returns {object} New CSS with z-index added
+                               */
+                              (base) => ({...base, zIndex: 9999}),
+              valueContainer:
+                              /**
+                               * Adds appropriate zIndex to the react select's base CSS
+                               *
+                               * @param {object} base - The current CSS
+                               * @returns {object} New CSS with z-index added
+                               */
+                              (base) => ({
+                                ...base,
+                                maxHeight: '200px',
+                                overflowY: 'auto',
+                              }),
+              }
+            }
+            value={selectedVisits}
+            closeMenuOnSelect={false}
+          /></div>}
       </div>;
     }
 
     fieldList = (<div>
-      <div style={{display: 'flex', flexWrap: 'wrap',
-        justifyContent: 'space-between'}}>
-        <h2>{
-          t('{{columnName}} fields', {ns: 'dataquery', columnName: cname})
-        }</h2>
-        <div style={{marginTop: '1em',
+      <div style={{display: 'flex', flexDirection: 'column',
+        marginTop: '32px'}}>
+        <div style={{
           display: 'flex',
           flexWrap: 'nowrap',
           flexDirection: 'column',
         }}>
           {defaultVisits}
-          <div className="input-group">
-            <input onChange={setFilter}
-              className='form-control'
-              type="text"
-              placeholder={t('Filter within category', {ns: 'dataquery'})}
-              aria-describedby="input-filter-addon"
-              value={activeFilter} />
-            <span className="input-group-addon">
-              <span className="glyphicon glyphicon-search"/>
-            </span>
-          </div>
-          <div style={{margin: '1ex',
+          <div style={{
+            width: '100%',
             display: 'flex',
-            flexWrap: 'wrap',
-            flexDirection: 'row',
-            justifyContent: 'space-around',
-          }}>
-            <button type="button" className="btn btn-primary"
-              onClick={addAll}>
-              {t('Add all', {ns: 'dataquery'})}
-            </button>
-            <button type="button" className="btn btn-primary"
-              onClick={removeAll}>
-              {t('Remove all', {ns: 'dataquery'})}
-            </button>
+            marginBottom: '8px',
+            alignItems: 'center',
+            justifyContent: 'space-between'}}>
+            <div className="input-group"
+              style={{width: '50%', display: 'flex'}}>
+              <input onChange={setFilter}
+                className='form-control'
+                type="text"
+                placeholder={t(`Filter within ${cname}`, {ns: 'dataquery'})}
+                aria-describedby="input-filter-addon"
+                value={activeFilter}
+                style={{borderRadius: '32px 0 0 32px'}}/>
+              <span className="input-group-addon"
+                style={{
+                  borderRadius: '0 32px 32px 0',
+                  height: '34px',
+                  display: 'flex',
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                  padding: '0 20px',
+                  cursor: 'pointer',
+                }}
+                id="input-filter-addon">
+                <span className="glyphicon glyphicon-search"/>
+              </span>
+            </div>
+            <div style={{
+              display: 'flex',
+              flexWrap: 'wrap',
+              flexDirection: 'row',
+              justifyContent: 'space-around',
+            }}>
+              <button type="button" className="btn btn-primary"
+                onClick={addAll}>
+                {t('Add all', {ns: 'dataquery'})}
+              </button>
+              <button type="button" className="btn btn-primary"
+                onClick={removeAll}>
+                {t('Remove all', {ns: 'dataquery'})}
+              </button>
+            </div>
           </div>
         </div>
       </div>
@@ -423,10 +472,11 @@ function DefineFields(props: {
     <div>
       <div style={{display: 'flex', flexWrap: 'nowrap'}}>
         <div style={{width: '80vw', padding: '1em'}}>
-          <h1>{t('Available Fields', {ns: 'dataquery'})}</h1>
           <FilterableSelectGroup groups={props.allCategories.categories}
             mapGroupName={(key) => props.allCategories.modules[key]}
             onChange={props.onCategoryChange}
+            label={t('Select a field', {ns: 'dataquery'})}
+            placeholder={t('Available Fields', {ns: 'dataquery'})}
           />
           {fieldList}
         </div>
diff --git a/modules/dataquery/locale/dataquery.pot b/modules/dataquery/locale/dataquery.pot
index 165db07949d..88ee5410935 100644
--- a/modules/dataquery/locale/dataquery.pot
+++ b/modules/dataquery/locale/dataquery.pot
@@ -515,13 +515,13 @@ msgstr ""
 msgid "Remove all"
 msgstr ""
 
-msgid "Filter within category"
+msgid "Filter within ${cname}"
 msgstr ""
 
 msgid "Default Visits"
 msgstr ""
 
-msgid "Sync with selected fields"
+msgid "Sync visit selection across selected fields"
 msgstr ""
 
 msgid "Select a category"
diff --git a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
index 11b88ab4adf..bf9db758dd0 100644
--- a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
@@ -514,13 +514,15 @@ msgstr "सभी जोड़ें"
 msgid "Remove all"
 msgstr "सभी हटाएँ"
 
-msgid "Filter within category"
+# NEEDS UPDATE
+msgid "Filter within ${cname}"
 msgstr "श्रेणी के भीतर फ़िल्टर करें"
 
 msgid "Default Visits"
 msgstr "डिफ़ॉल्ट विज़िट"
 
-msgid "Sync with selected fields"
+# NEEDS UPDATE
+msgid "Sync visit selection across selected fields"
 msgstr "चयनित फ़ील्ड के साथ समन्वय करें"
 
 msgid "Select a category"
diff --git a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
index d1374b635aa..08443aeedda 100644
--- a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
@@ -510,13 +510,15 @@ msgstr "すべて追加"
 msgid "Remove all"
 msgstr "すべて削除"
 
-msgid "Filter within category"
+# NEEDS UPDATE
+msgid "Filter within ${cname}"
 msgstr "カテゴリ内でフィルタリング"
 
 msgid "Default Visits"
 msgstr "デフォルトの訪問"
 
-msgid "Sync with selected fields"
+# NEEDS UPDATE
+msgid "Sync visit selection across selected fields"
 msgstr "選択したフィールドと同期"
 
 msgid "Select a field"