diff --git a/hexrd/ui/indexing/fit_grains_options_dialog.py b/hexrd/ui/indexing/fit_grains_options_dialog.py
index 6a36cf4b6..7ddd227e0 100644
--- a/hexrd/ui/indexing/fit_grains_options_dialog.py
+++ b/hexrd/ui/indexing/fit_grains_options_dialog.py
@@ -14,6 +14,7 @@
 from hexrd.ui.reflections_table import ReflectionsTable
 from hexrd.ui.ui_loader import UiLoader
 from hexrd.ui.utils import block_signals
+from hexrd.ui.utils.dialog import add_help_url
 
 from hexrd.ui.indexing.fit_grains_tolerances_model import (
     FitGrainsToleranceModel)
@@ -41,6 +42,9 @@ def __init__(self, grains_table, ensure_seed_hkls_not_excluded=True,
         flags = self.ui.windowFlags()
         self.ui.setWindowFlags(flags | Qt.Tool)
 
+        url = 'hedm/fit_grains/#fit-grains-options'
+        add_help_url(self.ui.button_box, url)
+
         self.update_materials()
 
         kwargs = {
@@ -72,8 +76,6 @@ def __init__(self, grains_table, ensure_seed_hkls_not_excluded=True,
     def setup_connections(self):
         self.ui.accepted.connect(self.on_accepted)
         self.ui.rejected.connect(self.rejected)
-        self.ui.tth_max_enable.toggled.connect(self.on_tth_max_toggled)
-        self.ui.tth_max_specify.toggled.connect(self.on_tth_specify_toggled)
         self.ui.tolerances_view.selectionModel().selectionChanged.connect(
             self.on_tolerances_select)
         self.ui.add_row.clicked.connect(self.on_tolerances_add_row)
@@ -108,10 +110,6 @@ def all_widgets(self):
             self.ui.refit_pixel_scale,
             self.ui.tolerances_view,
             self.ui.threshold,
-            self.ui.tth_max_enable,
-            self.ui.tth_max_instrument,
-            self.ui.tth_max_specify,
-            self.ui.tth_max_value,
         ]
         return widgets
 
@@ -232,16 +230,6 @@ def tolerance_data_modified(self):
 
         self.ui.grains_table_view.tolerances = tolerances
 
-    def on_tth_max_toggled(self, checked):
-        enabled = checked
-        self.ui.tth_max_instrument.setEnabled(enabled)
-        self.ui.tth_max_specify.setEnabled(enabled)
-        specify = self.ui.tth_max_specify.isChecked()
-        self.ui.tth_max_value.setEnabled(enabled and specify)
-
-    def on_tth_specify_toggled(self, checked):
-        self.ui.tth_max_value.setEnabled(checked)
-
     def update_config(self):
         # Set the new config options on the internal config
         config = HexrdConfig().indexing_config['fit_grains']
@@ -249,12 +237,10 @@ def update_config(self):
         config['refit'][0] = self.ui.refit_pixel_scale.value()
         config['refit'][1] = self.ui.refit_ome_step_scale.value()
         config['threshold'] = self.ui.threshold.value()
-        if not self.ui.tth_max_enable.isChecked():
-            config['tth_max'] = False
-        elif self.ui.tth_max_instrument.isChecked():
-            config['tth_max'] = True
-        else:
-            config['tth_max'] = self.ui.tth_max_value.value()
+
+        # The user sets the HKLs manually. Make sure this is set to False to
+        # reflect that.
+        config['tth_max'] = False
 
         self.tolerances_model.copy_to_config(config)
 
@@ -271,27 +257,6 @@ def update_gui_from_config(self, config):
             self.ui.refit_ome_step_scale.setValue(config.get('refit')[1])
             self.ui.threshold.setValue(config.get('threshold'))
 
-            tth_max = config.get('tth_max')
-            if isinstance(tth_max, bool):
-                enabled = tth_max
-                instrument = tth_max
-                value = 0.0
-            else:
-                enabled = True
-                instrument = False
-                value = tth_max
-
-            self.ui.tth_max_enable.setChecked(enabled)
-
-            self.ui.tth_max_instrument.setEnabled(enabled)
-            self.ui.tth_max_instrument.setChecked(instrument)
-
-            self.ui.tth_max_specify.setEnabled(enabled)
-            self.ui.tth_max_specify.setChecked(not instrument)
-
-            self.ui.tth_max_value.setEnabled(enabled and (not instrument))
-            self.ui.tth_max_value.setValue(value)
-
             tolerances = config.get('tolerance')
             self.tolerances_model.update_from_config(tolerances)
 
diff --git a/hexrd/ui/indexing/fit_grains_results_dialog.py b/hexrd/ui/indexing/fit_grains_results_dialog.py
index 36f444e21..084b66a9c 100644
--- a/hexrd/ui/indexing/fit_grains_results_dialog.py
+++ b/hexrd/ui/indexing/fit_grains_results_dialog.py
@@ -25,6 +25,7 @@
 from hexrd.ui.navigation_toolbar import NavigationToolbar
 from hexrd.ui.ui_loader import UiLoader
 from hexrd.ui.utils import block_signals
+from hexrd.ui.utils.dialog import add_help_url
 
 
 COORDS_SLICE = slice(6, 9)
@@ -68,6 +69,9 @@ def __init__(self, data, material=None, parent=None,
         loader = UiLoader()
         self.ui = loader.load_file('fit_grains_results_dialog.ui', parent)
 
+        url = 'hedm/fit_grains/#fit-grains-results'
+        add_help_url(self.ui.button_box, url)
+
         self.ui.splitter.setStretchFactor(0, 1)
         self.ui.splitter.setStretchFactor(1, 10)
         self.ui.export_workflow.setEnabled(allow_export_workflow)
diff --git a/hexrd/ui/indexing/view_spots_dialog.py b/hexrd/ui/indexing/view_spots_dialog.py
index a1a0968ec..65864396c 100644
--- a/hexrd/ui/indexing/view_spots_dialog.py
+++ b/hexrd/ui/indexing/view_spots_dialog.py
@@ -13,6 +13,7 @@
 from hexrd.ui.navigation_toolbar import NavigationToolbar
 from hexrd.ui.ui_loader import UiLoader
 from hexrd.ui.utils import block_signals
+from hexrd.ui.utils.dialog import add_help_url
 
 
 class ViewSpotsDialog:
@@ -20,6 +21,9 @@ def __init__(self, spots, parent=None):
         loader = UiLoader()
         self.ui = loader.load_file('view_spots_dialog.ui', parent)
 
+        url = 'hedm/fit_grains/#visualize-spots'
+        add_help_url(self.ui.button_box, url)
+
         self.setup_canvas()
 
         self.spots = spots
diff --git a/hexrd/ui/resources/ui/fit_grains_options_dialog.ui b/hexrd/ui/resources/ui/fit_grains_options_dialog.ui
index ddaff5c07..5f87c9fc2 100644
--- a/hexrd/ui/resources/ui/fit_grains_options_dialog.ui
+++ b/hexrd/ui/resources/ui/fit_grains_options_dialog.ui
@@ -40,6 +40,20 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <item row="6" column="1" colspan="2">
+      <widget class="QLabel" name="refit_ome_label">
+       <property name="text">
+        <string>Refit ome step scale</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1" colspan="2">
+      <widget class="QLabel" name="refit_pixel_labe">
+       <property name="text">
+        <string>Refit pixel scale</string>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="1" colspan="2">
       <widget class="QLabel" name="num_hkls_selected">
        <property name="text">
@@ -54,46 +68,16 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1" colspan="2">
-      <widget class="QLabel" name="material_label">
-       <property name="text">
-        <string>Selected Material:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="3">
-      <widget class="ScientificDoubleSpinBox" name="min_sfac_value">
+     <item row="4" column="3" colspan="3">
+      <widget class="ScientificDoubleSpinBox" name="threshold">
        <property name="decimals">
         <number>8</number>
        </property>
        <property name="maximum">
-        <double>100.000000000000000</double>
+        <double>1000000.000000000000000</double>
        </property>
        <property name="value">
-        <double>5.000000000000000</double>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="5">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="2" column="1" colspan="2">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Select HKLs by min |F|² ?</string>
+        <double>25.000000000000000</double>
        </property>
       </widget>
      </item>
@@ -104,71 +88,36 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1" colspan="2">
-      <widget class="QLabel" name="threshold_label">
-       <property name="text">
-        <string>Threshold</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1" colspan="2">
-      <widget class="QLabel" name="refit_pixel_labe">
-       <property name="text">
-        <string>Refit pixel scale</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1" colspan="2">
-      <widget class="QLabel" name="refit_ome_label">
-       <property name="text">
-        <string>Refit ome step scale</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1" colspan="2">
-      <widget class="QCheckBox" name="tth_max_enable">
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enabling this will cause the HKLs to be modified again during fit-grains so that no HKLs above this tth max will be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="text">
-        <string>override tth max</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1" colspan="2">
-      <widget class="QRadioButton" name="tth_max_instrument">
-       <property name="enabled">
-        <bool>false</bool>
+     <item row="5" column="3" colspan="3">
+      <widget class="ScientificDoubleSpinBox" name="refit_pixel_scale">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="styleSheet">
-        <string notr="true">padding-left: 20px;
-</string>
+       <property name="decimals">
+        <number>8</number>
        </property>
-       <property name="text">
-        <string>Instrument</string>
+       <property name="maximum">
+        <double>1000000.000000000000000</double>
        </property>
-       <property name="checked">
-        <bool>true</bool>
+       <property name="value">
+        <double>2.000000000000000</double>
        </property>
       </widget>
      </item>
-     <item row="9" column="1" colspan="2">
-      <widget class="QRadioButton" name="tth_max_specify">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">padding-left: 20px;</string>
-       </property>
+     <item row="1" column="3" colspan="3">
+      <widget class="QPushButton" name="choose_hkls">
        <property name="text">
-        <string>Specify</string>
+        <string>Choose HKLs</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="1" colspan="2">
-      <widget class="QCheckBox" name="write_out_spots">
+     <item row="0" column="1" colspan="2">
+      <widget class="QLabel" name="material_label">
        <property name="text">
-        <string>Write out spots files</string>
+        <string>Selected Material:</string>
        </property>
       </widget>
      </item>
@@ -194,66 +143,65 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="3" colspan="3">
-      <widget class="QComboBox" name="material"/>
+     <item row="4" column="1" colspan="2">
+      <widget class="QLabel" name="threshold_label">
+       <property name="text">
+        <string>Threshold</string>
+       </property>
+      </widget>
      </item>
-     <item row="1" column="3" colspan="3">
-      <widget class="QPushButton" name="choose_hkls">
+     <item row="2" column="1" colspan="2">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string>Choose HKLs</string>
+        <string>Select HKLs by min |F|² ?</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="3" colspan="3">
-      <widget class="ScientificDoubleSpinBox" name="threshold">
-       <property name="decimals">
-        <number>8</number>
+     <item row="2" column="5">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="maximum">
-        <double>1000000.000000000000000</double>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="value">
-        <double>25.000000000000000</double>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>20</height>
+        </size>
        </property>
-      </widget>
+      </spacer>
      </item>
-     <item row="5" column="3" colspan="3">
-      <widget class="ScientificDoubleSpinBox" name="refit_pixel_scale">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
+     <item row="2" column="3">
+      <widget class="ScientificDoubleSpinBox" name="min_sfac_value">
        <property name="decimals">
         <number>8</number>
        </property>
        <property name="maximum">
-        <double>1000000.000000000000000</double>
+        <double>100.000000000000000</double>
        </property>
        <property name="value">
-        <double>2.000000000000000</double>
+        <double>5.000000000000000</double>
        </property>
       </widget>
      </item>
-     <item row="6" column="3" colspan="3">
-      <widget class="ScientificDoubleSpinBox" name="refit_ome_step_scale">
-       <property name="decimals">
-        <number>8</number>
-       </property>
-       <property name="maximum">
-        <double>1000000.000000000000000</double>
-       </property>
-       <property name="value">
-        <double>1.000000000000000</double>
+     <item row="7" column="1" colspan="2">
+      <widget class="QCheckBox" name="write_out_spots">
+       <property name="text">
+        <string>Write out spots files</string>
        </property>
       </widget>
      </item>
-     <item row="9" column="3" colspan="3">
-      <widget class="ScientificDoubleSpinBox" name="tth_max_value">
-       <property name="enabled">
-        <bool>false</bool>
+     <item row="7" column="3" colspan="3">
+      <widget class="QPushButton" name="set_spots_directory">
+       <property name="text">
+        <string>Select Directory</string>
        </property>
+      </widget>
+     </item>
+     <item row="6" column="3" colspan="3">
+      <widget class="ScientificDoubleSpinBox" name="refit_ome_step_scale">
        <property name="decimals">
         <number>8</number>
        </property>
@@ -261,16 +209,12 @@
         <double>1000000.000000000000000</double>
        </property>
        <property name="value">
-        <double>20.000000000000000</double>
+        <double>1.000000000000000</double>
        </property>
       </widget>
      </item>
-     <item row="10" column="3" colspan="3">
-      <widget class="QPushButton" name="set_spots_directory">
-       <property name="text">
-        <string>Select Directory</string>
-       </property>
-      </widget>
+     <item row="0" column="3" colspan="3">
+      <widget class="QComboBox" name="material"/>
      </item>
     </layout>
    </item>
@@ -390,7 +334,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -419,10 +363,6 @@
   <tabstop>threshold</tabstop>
   <tabstop>refit_pixel_scale</tabstop>
   <tabstop>refit_ome_step_scale</tabstop>
-  <tabstop>tth_max_enable</tabstop>
-  <tabstop>tth_max_instrument</tabstop>
-  <tabstop>tth_max_specify</tabstop>
-  <tabstop>tth_max_value</tabstop>
   <tabstop>write_out_spots</tabstop>
   <tabstop>set_spots_directory</tabstop>
   <tabstop>tolerances_view</tabstop>
diff --git a/hexrd/ui/resources/ui/fit_grains_results_dialog.ui b/hexrd/ui/resources/ui/fit_grains_results_dialog.ui
index 822addcd9..47df4332d 100644
--- a/hexrd/ui/resources/ui/fit_grains_results_dialog.ui
+++ b/hexrd/ui/resources/ui/fit_grains_results_dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1200</width>
-    <height>830</height>
+    <height>865</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -556,17 +556,30 @@
       </widget>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="button_box">
+      <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
        </property>
-      </widget>
+      </spacer>
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="button_box">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/hexrd/ui/resources/ui/view_spots_dialog.ui b/hexrd/ui/resources/ui/view_spots_dialog.ui
index 06cfc5d44..214787256 100644
--- a/hexrd/ui/resources/ui/view_spots_dialog.ui
+++ b/hexrd/ui/resources/ui/view_spots_dialog.ui
@@ -23,8 +23,8 @@
    <string notr="true"/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1">
-    <widget class="QComboBox" name="grain_id">
+   <item row="1" column="3">
+    <widget class="QComboBox" name="detector">
      <property name="styleSheet">
       <string notr="true">combobox-popup: 0;</string>
      </property>
@@ -33,33 +33,36 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="grain_id_label">
+   <item row="1" column="10">
+    <widget class="QLabel" name="tolerances_label">
      <property name="text">
-      <string>Grain ID:</string>
+      <string>Tolerances:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="9">
-    <spacer name="horizontal_spacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="grain_id">
+     <property name="styleSheet">
+      <string notr="true">combobox-popup: 0;</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="detector_label">
-     <property name="text">
-      <string>Detector:</string>
+   <item row="1" column="7">
+    <widget class="QComboBox" name="peak_id">
+     <property name="styleSheet">
+      <string notr="true">combobox-popup: 0;</string>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
      </property>
     </widget>
    </item>
+   <item row="3" column="0" colspan="13">
+    <layout class="QVBoxLayout" name="canvas_layout"/>
+   </item>
    <item row="1" column="6">
     <widget class="QLabel" name="peak_id_label">
      <property name="text">
@@ -70,30 +73,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="4">
-    <widget class="QLabel" name="hkl_label">
-     <property name="text">
-      <string>HKL:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="7">
-    <widget class="QComboBox" name="peak_id">
-     <property name="styleSheet">
-      <string notr="true">combobox-popup: 0;</string>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToContents</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="10">
-    <widget class="QLabel" name="tolerances_label">
+   <item row="1" column="0">
+    <widget class="QLabel" name="grain_id_label">
      <property name="text">
-      <string>Tolerances:</string>
+      <string>Grain ID:</string>
      </property>
     </widget>
    </item>
@@ -114,16 +97,17 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="13">
-    <layout class="QVBoxLayout" name="canvas_layout"/>
-   </item>
-   <item row="1" column="3">
-    <widget class="QComboBox" name="detector">
-     <property name="styleSheet">
-      <string notr="true">combobox-popup: 0;</string>
+   <item row="2" column="5" colspan="3">
+    <widget class="QCheckBox" name="show_frame_indices">
+     <property name="text">
+      <string>Show Frame Indices</string>
      </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToContents</enum>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QLabel" name="detector_label">
+     <property name="text">
+      <string>Detector:</string>
      </property>
     </widget>
    </item>
@@ -134,10 +118,33 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="5" colspan="3">
-    <widget class="QCheckBox" name="show_frame_indices">
+   <item row="1" column="9">
+    <spacer name="horizontal_spacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="4">
+    <widget class="QLabel" name="hkl_label">
      <property name="text">
-      <string>Show Frame Indices</string>
+      <string>HKL:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="12">
+    <widget class="QDialogButtonBox" name="button_box">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Help</set>
      </property>
     </widget>
    </item>