Index: src/sas/calculator/media/sld_calculator_help.rst
===================================================================
--- src/sas/calculator/media/sld_calculator_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/calculator/media/sld_calculator_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -3,4 +3,6 @@
 .. This is a port of the original SasView html help file to ReSTructured text
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+
+.. |Ang| unicode:: U+212B
 
 SLD Calculator Tool
@@ -12,5 +14,5 @@
 The neutron scattering length density is defined as
 
-SLD = (b_c1 +b_c2+...+b_cn )/Vm
+SLD = (b_c1 + b_c2 + ... + b_cn) / Vm
 
 where 
@@ -24,26 +26,28 @@
 -------------------------------
 
-To calculate scattering length densities enter a compound and a mass density 
-and click "Calculate". Entering a wavelength value is optional (a default 
-value of 6.0 Angstroms will be used).
+To calculate scattering length densities enter the empirical formula of a 
+compound and its mass density and click "Calculate".
 
-* Formula strings consist of counts and atoms such as "CaCO3+6H2O".
+Entering a wavelength value is optional (a default value of 6.0 |Ang| will 
+be used).
 
-* Groups can be separated by *'+'* or *space*, so "CaCO3 6H2O" works as well.
+*  Formula strings consist of atoms and the number of them, such as "CaCO3+6H2O".
 
-* Groups and be defined using parentheses, such as "CaCO3(H2O)6".
+*  Groups can be separated by *'+'* or *space*, so "CaCO3 6H2O" works as well.
 
-* Parentheses can be nested, such as "(CaCO3(H2O)6)1".
+*  Groups can be defined using parentheses, such as "CaCO3(H2O)6".
 
-* Isotopes are represented by their index, e.g., "CaCO[18]3+6H2O", H[1], or 
-H[2].
+*  Parentheses can be nested, such as "(CaCO3(H2O)6)1".
 
-* Counts can be integer or decimal, e.g. "CaCO3+(3HO0.5)2".
+*  Isotopes are represented by their atomic number in *square brackets*, such 
+   as "CaCO[18]3+6H2O", H[1], or H[2].
 
-* Other compositions can be calculated as well, for example, for a 70-30 
-mixture of H2O/D2O write *H14O7+ D6O3* or more simply *H7D3O5* (i.e. this says 
-7 hydrogens, 3 deuteriums, and 5 oxygens) and the mass density calculated 
-based on the percentages of H and D.
+*  Numbers of atoms can be integer or decimal, such as "CaCO3+(3HO0.5)2".
 
-* Type *C[13]6 H[2]12 O[18]6* for C(13)6H(2)12O(18)6 (6 Carbon-13 atoms, 12 
-deuterium atoms, and 6 Oxygen-18 atoms)
+*  The SLD of mixtures can be calculated as well. For example, for a 70-30 
+   mixture of H2O/D2O write "H14O7+D6O3" or more simply "H7D3O5" (i.e. this says
+   7 hydrogens, 3 deuteriums, and 5 oxygens) and enter a mass density calculated
+   on the percentages of H2O and D2O.
+
+*  Type "C[13]6 H[2]12 O[18]6" for C(13)6H(2)12O(18)6 (6 Carbon-13 atoms, 12 
+   deuterium atoms, and 6 Oxygen-18 atoms).
Index: src/sas/data_util/media/data_operator_help.rst
===================================================================
--- src/sas/data_util/media/data_operator_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/data_util/media/data_operator_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -12,5 +12,5 @@
 last data set could be a number).
 
-When the data1 and data2 are selected, their x (or qx and qy for 2D) value(s) 
+When data1 and data2 are selected, their x (or qx and qy for 2D) value(s)
 must match with each other.
 
@@ -22,19 +22,18 @@
 
 2) Select a data/theory in the drop down menus. When data2 is set to number, 
-type a number in the text control box.
+   type a number in the text control box.
 
 3) Select an arithmetic operator symbol; + (for addition), - (for subtraction), 
-* (for multiplication), / (for division), and | (for combination of two data 
-sets).
+   * (for multiplication), / (for division), and | (for combination of two data
+   sets).
 
-If two data sets do not match, the operation will fail and the background color 
-of the combo box items will turn to red (WIN only).
+   If two data sets do not match, the operation will fail and the background color
+   of the combo box items will turn to red (WIN only).
 
 4) If the operation is successful, hit the Apply button to make the new data.
-Then the data name will be shown up in the data box in the data explorer.
+   Then the data name will be shown up in the data box in the data explorer.
 
-Note: The errors and warnings will be displayed at the bottom of the SasView 
+Note: Any errors and warnings will be displayed at the bottom of the SasView
 window.
 
-.. image:: data_oper_pic.png
-
+.. image:: image:: docs/sphinx-docs/source/user/calculator/media/data_oper_pic.png
Index: src/sas/fit/media/fitting_help.rst
===================================================================
--- src/sas/fit/media/fitting_help.rst	(revision 898a8b9ecad396849fbc7fad88855e8e34d0f503)
+++ src/sas/fit/media/fitting_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -15,15 +15,27 @@
 
 Load_a_File_
+
 Single_Fit_
+
 Simultaneous_Fitting_
+
 Batch_Fitting_
+
 Model_Selection_
+
 Model_Category_Manager_
+
 Model_Functions_
+
 Custom_Model_Editor_
+
 Polydispersity_Distributions_
+
 Smearing_Computation_
-Polarisation/Magnetic_Scattering_
+
+Polarisation_Magnetic_Scattering_
+
 Key_Combinations_
+
 Status_Bar_Help_
 
@@ -100,11 +112,17 @@
 -------------
 
-.. _Batch_Fit_
-.. _Batch_Window_
-.. _Edit_Grid_ 
-.. _Save_Grid_ 
-.. _Open_Batch_Results_ 
-.. _Plot_ 
-.. _View_Column_Cell_ 
+Batch_Fit_
+
+Batch_Window_
+
+Edit_Grid_
+
+Save_Grid_
+
+Open_Batch_Results_
+
+Plot_
+
+View_Column_Cell_
 
 .. _Batch_Fit:
@@ -117,5 +135,5 @@
 Fitting menubar.
 
-.. image:: batch_button_area.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/batch_button_area.bmp
 
 Figure 1: MenuBar: 
@@ -154,5 +172,5 @@
 Figure 2).
 
-.. image:: restore_batch_window.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/restore_batch_window.bmp
 
 Figure 2: Edit Menu: 
@@ -179,5 +197,5 @@
 column in the grid.
 
-.. image:: edit_menu.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/edit_menu.bmp
 
 Figure 3: Edit Menu:
@@ -191,7 +209,7 @@
 .csv file.
 
- *Note:* The grid doesn't save the data array, fits, and the array residuals. 
- As a result, the 'View (fit) Results' functionality will be lost when 
- reloading the saved file.
+*Note:* The grid doesn't save the data array, fits, and the array residuals.
+As a result, the 'View (fit) Results' functionality will be lost when
+reloading the saved file.
 
 Warning! To ensure accuracy of saved fit results, it is recommended to save 
@@ -208,5 +226,5 @@
 available only when at least one column will be removed from the grid.
 
-.. image:: file_menu.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/file_menu.bmp
 
 Figure 4: MenuBar:
@@ -226,6 +244,6 @@
 clicking on the plot button.
 
- *X/Y -Axis Selection Range* can be edited manually. These text controls 
- allow the following types of expression (operation can be + - * /, or pow)
+*X/Y -Axis Selection Range* can be edited manually. These text controls
+allow the following types of expression (operation can be + - * /, or pow)
  
 1) if the current axis label range is a function of 1 or more columns, write 
@@ -249,5 +267,5 @@
 with valid entries for plotting to work. The dY-bar is optional (see Figure 5).
 
-.. image::plot_button.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/plot_button.bmp
 
 Figure 5: Plotting
@@ -271,5 +289,5 @@
 data and fits. 
 
-.. image::view_button.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/view_button.bmp
 
 Figure 6: View Fits
@@ -280,6 +298,8 @@
 
 Model_Type_ 
-Change_Model_Parameters_ 
-Write_your_Own_Model_ 
+
+Change_Model_Parameters_
+
+Write_your_Own_Model_
 
 .. _Model_Type:
@@ -345,13 +365,13 @@
 button (Fig. 2).
 
-.. image:: cat_fig0.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/cat_fig0.bmp
 
 Fig.1
 
-.. image:: cat_fig1.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/cat_fig1.bmp
 
 Fig.2
 
-.. image:: cat_fig2.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/cat_fig2.bmp
 
 Fig.3
@@ -374,8 +394,12 @@
 
 Description_ 
-New_ 
-Sum_Multi_p1_p2_ 
-Advanced_ 
-Delete_ 
+
+New_
+
+Sum_Multi_p1_p2_
+
+Advanced_
+
+Delete_
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -390,5 +414,5 @@
 function are effective after it is re-selected from the combo-box menu.
 
-.. image:: edit_model_menu.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/edit_model_menu.bmp
 
 .. _New:
@@ -400,5 +424,5 @@
 can be viewed and further modified by the 'Advanced' option below.
 
-.. image:: new_model.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/new_model.bmp
 
 .. _Sum_Multi_p1_p2:
@@ -413,5 +437,5 @@
 for activation. Hit the 'Close' button when it's done.
 
-.. image:: sum_model.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sum_model.bmp
 
 .. _Advanced:
@@ -422,5 +446,5 @@
 The menu option shows all the files in the plugin_models folder. You can edit, 
 modify, and save it. It is recommended to modify only the lines with arrow 
-(--`-----). In the end of edit, 'Compile' and 'Run' from the menu bar to 
+(-------). In the end of edit, 'Compile' and 'Run' from the menu bar to
 activate or to see the model working properly.
 
@@ -470,5 +494,5 @@
 ------------------------
 
-.. image:: img/pd_image001.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image001.png
 
 The xmean is the mean of the distribution, w is the half-width, and Norm is a 
@@ -478,11 +502,11 @@
 The standard deviation is
 
-.. image:: img/pd_image002.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image002.png
 
 The PD (polydispersity) is
 
-.. image:: img/pd_image003.png
-
-.. image:: img/pd_image004.jpg
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image003.png
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image004.jpg
 
 .. _Array_Distribution:
@@ -513,5 +537,5 @@
 ---------------------
 
-.. image:: img/pd_image005.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image005.png
 
 The xmean is the mean of the distribution and Norm is a normalization factor 
@@ -520,7 +544,7 @@
 The PD (polydispersity) is
 
-.. image:: img/pd_image003.png
-
-.. image:: img/pd_image006.jpg
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image003.png
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image006.jpg
 
 .. _Lognormal_Distribution:
@@ -529,5 +553,5 @@
 ----------------------
 
-.. image:: img/pd_image007.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image007.png
 
 The /mu/=ln(xmed), xmed is the median value of the distribution, and Norm is a 
@@ -538,14 +562,14 @@
 The PD (polydispersity) is given by /sigma/
 
-.. image:: img/pd_image008.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image008.png
 
 For the angular distribution
 
-.. image:: img/pd_image009.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image009.png
 
 The mean value is given by xmean=exp(/mu/+p2/2). The peak value is given by 
 xpeak=exp(/mu/-p2).
 
-.. image:: img/pd_image010.jpg
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image010.jpg
 
 This distribution function spreads more and the peak shifts to the left as the 
@@ -557,7 +581,7 @@
 -------------------
 
-.. image:: img/pd_image011.png
-
-The xmeanis the mean of the distribution and Norm is a normalization factor 
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image011.png
+
+The xmean is the mean of the distribution and Norm is a normalization factor
 which is determined during the numerical calculation.
 
@@ -566,5 +590,5 @@
 The PD (polydispersity) is
 
-.. image:: img/pd_image012.png
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image012.png
 
 Note that the higher PD (polydispersity) might need higher values of Npts and 
@@ -572,5 +596,5 @@
 Nsigmas >= 15 at least.
 
-.. image:: img/pd_image013.jpg
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/pd_image013.jpg
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -582,6 +606,8 @@
 
 Slit_Smearing_ 
-Pinhole_Smearing_ 
-2D_Smearing_ 
+
+Pinhole_Smearing_
+
+2D_Smearing_
 
 .. _Slit_Smearing:
@@ -592,18 +618,18 @@
 The sit smeared scattering intensity for SAS is defined by
 
-.. image:: img/sm_image002.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image002.gif
 
 where Norm =
 
-.. image:: img/sm_image003.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image003.gif
 
 Equation 1
 
-The functions .. image:: img/sm_image004.gif and .. image:: img/sm_image005.gif
+The functions .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image004.gif and .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image005.gif
 refer to the slit width weighting function and the slit height weighting 
 determined at the q point, respectively. Here, we assumes that the weighting 
 function is described by a rectangular function, i.e.,
 
-.. image:: img/sm_image006.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image006.gif
 
 Equation 2
@@ -611,16 +637,16 @@
 and
 
-.. image:: img/sm_image007.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image007.gif
 
 Equation 3
 
-so that .. image:: img/sm_image008.gif .. image::img/sm_image009.gif for 
-.. image:: img/sm_image010.gif and u.
-
-The .. image::img/sm_image011.gif and .. image::img/sm_image012.gif stand for 
+so that .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image008.gif .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image009.gif for
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image010.gif and u.
+
+The .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif and .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif stand for
 the slit height (FWHM/2) and the slit width (FWHM/2) in the q space. Now the 
 integral of Equation 1 is simplified to
 
-.. image:: img/sm_image013.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image013.gif
 
 Equation 4
@@ -632,29 +658,30 @@
 ------
 
-For .. image:: img/sm_image012.gif = 0 and .. image:: img/sm_image011.gif = 
+For .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif = 0 and .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif = 
 constant.
 
-.. image:: img/sm_image016.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image016.gif
 
 For discrete q values, at the q values from the data points and at the q 
-values extended up to qN= qi + .. image:: img/sm_image011.gif the smeared 
+values extended up to qN= qi + .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif the smeared 
 intensity can be calculated approximately
 
-.. image:: img/sm_image017.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image017.gif
 
 Equation 5
 
-.. image:: img/sm_image018.gif = 0 for *Is* in *j* < *i* or *j* > N-1*.
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image018.gif = 0 for *Is* in *j* < *i* or *j* > N-1*.
 
 Case 2
 ------
 
-For .. image:: img/sm_image012.gif = constant and 
-.. image:: img/sm_image011.gif = 0.
+For .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif = constant and 
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif = 0.
 
 Similarly to Case 1, we get
 
-.. image:: img/sm_image019.gif for qp= qi-.. image:: img/sm_image012.gif 
-and qN= qi+.. image:: img/sm_image012.gif. .. image:: img/sm_image018.gif = 0 
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image019.gif for qp= qi- .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif
+
+and qN= qi+ .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif. .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image018.gif = 0
 for *Is* in *j* < *p* or *j* > *N-1*.
 
@@ -662,6 +689,6 @@
 ------
 
-For .. image:: img/sm_image011.gif = constant and 
-.. image:: img/sm_image011.gif = constant.
+For .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif = constant and 
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image011.gif = constant.
 
 In this case, the best way is to perform the integration, Equation 1, 
@@ -674,13 +701,13 @@
 numerical integration for the slit width.
 
-.. image:: img/sm_image020.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image020.gif
 
 Equation 7
 
-for qp= qi-.. image:: img/sm_image012.gif and 
-qN= qi+.. image:: img/sm_image012.gif. .. image:: img/sm_image018.gif = 0 for 
+for qp= qi- .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif and
+qN= qi+ .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image012.gif. .. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image018.gif = 0 for
 *Is* in *j* < *p* or *j* > *N-1*.
 
-.. Pinhole_Smearing:
+.. _Pinhole_Smearing:
 
 Pinhole Smearing
@@ -691,5 +718,5 @@
 for this case becomes
 
-.. image:: img/sm_image021.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image021.gif
 
 Equation 8
@@ -710,5 +737,5 @@
 except that the weight function used was the 2D elliptical Gaussian function
 
-.. image:: img/sm_image022.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image022.gif
 
 Equation 9
@@ -721,5 +748,5 @@
 distribution. The A is a normalization factor.
 
-.. image:: img/sm_image023.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image023.gif
 
 Now we consider a numerical integration where each bins in /theta/ and R are 
@@ -728,5 +755,5 @@
 within the bins which in turn becomes
 
-.. image:: img/sm_image024.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image024.gif
 
 Equation 10
@@ -736,5 +763,5 @@
 axis). Then, for the polar symmetric smear
 
-.. image:: img/sm_image025.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image025.gif
 
 Equation 11
@@ -742,9 +769,9 @@
 where
 
-.. image:: img/sm_image026.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image026.gif
 
 while for the x-y symmetric smear
 
-.. image:: img/sm_image027.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image027.gif
 
 Equation 12
@@ -752,5 +779,5 @@
 where
 
-.. image:: img/sm_image028.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sm_image028.gif
 
 Here, the current version of the SasView uses Equation 11 for 2D smearing 
@@ -782,9 +809,9 @@
 vector *Q* contributes to the the magnetic scattering length.
 
-... image:: img/mag_vector.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/mag_vector.bmp
 
 The magnetic scattering length density is then
 
-.. image:: img/dm_eq.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/dm_eq.gif
 
 where /gamma/ = -1.913 the gyromagnetic ratio, /mu/B is the Bohr magneton, r0 
@@ -799,5 +826,5 @@
 Spin flips:     (+ -) and (- +)
 
-.. image:: img/M_angles_pic.bmp
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/M_angles_pic.bmp
 
 Now, let's assume that the angles of the *Q*  vector and the spin-axis (x') 
@@ -807,21 +834,21 @@
 as, for non-spin-flips
 
-.. image:: img/sld1.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sld1.gif
 
 for spin-flips
 
-.. image:: img/sld2.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/sld2.gif
 
 where
 
-.. image:: img/mxp.gif
-
-.. image:: img/myp.gif
-
-.. image:: img/mzp.gif
-
-.. image:: img/mqx.gif
-
-.. image:: img/mqy.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/mxp.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/myp.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/mzp.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/mqx.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/mqy.gif
 
 Here, the M0x, M0y and M0z are the x, y and z components of the magnetization 
@@ -829,9 +856,9 @@
 and /phi/M as defined in the Figure (above)
 
-.. image:: img/m0x_eq.gif
-
-.. image:: img/m0y_eq.gif
-
-.. image:: img/m0z_eq.gif
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/m0x_eq.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/m0y_eq.gif
+
+.. image:: docs/sphinx-docs/source/user/perspectives/fitting/m0z_eq.gif
 
 The user input parameters are M0_sld = DMM0, Up_theta = /theta/up, 
@@ -843,5 +870,5 @@
 neutrons before the sample and at the analyzer, respectively.
 
-*Note: The values of the 'Up_frac_i' and 'Up_frac_f' must be in the range 
+*Note:* The values of the 'Up_frac_i' and 'Up_frac_f' must be in the range
 between 0 and 1.
 
@@ -854,6 +881,9 @@
 
 Copy_Paste_
+
 Bookmark_
+
 Graph_Context_Menu_
+
 FTolerance_
 
@@ -918,5 +948,6 @@
 
 Message_Warning_Hint_ 
-Console_ 
+
+Console_
 
 .. _Message_Warning_Hint:
Index: src/sas/guiframe/media/data_explorer_help.rst
===================================================================
--- src/sas/guiframe/media/data_explorer_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/guiframe/media/data_explorer_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -1,3 +1,3 @@
-.. _data_explorer_help.rst
+.. data_explorer_help.rst
 
 .. This is a port of the original SasView html help file to ReSTructured text
@@ -7,13 +7,21 @@
 ============
 
-1. Introduction_ 
-2. Load Data_
-3. Handy Menu_
-4. Activate Data_
-5. Remove Data_
-6. Append Plot to Graph_
-7. Create New Plot_
-8. Freeze Theory_
-9. Send Data to Applications_
+Introduction_
+
+Load_Data_
+
+Handy_Menu_
+
+Activate_Data_
+
+Remove_Data_
+
+Append_Plot_to_Graph_
+
+Create_New_Plot_
+
+Freeze_Theory_
+
+Send_Data_to_Applications_
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -23,4 +31,5 @@
 Introduction
 ------------
+
 *Data Explorer* is a panel that allows the user more interactions with data. 
 Some functionalities provided by the Data Explorer are also available through 
@@ -35,5 +44,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Load Data:
+.. _Load_Data:
 
 Load Data
@@ -48,5 +57,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Handy Menu:
+.. _Handy_Menu:
 
 Handy Menu
@@ -57,9 +66,9 @@
 context menu.
 
-.. _ image:: hand_menu.png
+.. image:: hand_menu.png
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Activate Data:
+.. _Activate_Data:
 
 Activate Data
@@ -75,5 +84,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Remove Data:
+.. _Remove_Data:
 
 Remove Data
@@ -86,5 +95,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Append Plot to Graph:
+.. _Append_Plot_to_Graph:
 
 Append Plot to Graph
@@ -100,5 +109,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Create New Plot:
+.. _Create_New_Plot:
 
 Create New Plot
@@ -110,5 +119,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Freeze Theory:
+.. _Freeze_Theory:
 
 Freeze Theory
@@ -120,5 +129,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Send to application:
+.. _Send_Data_to_Applications:
 
 Send to Application
Index: src/sas/guiframe/media/graph_help.rst
===================================================================
--- src/sas/guiframe/media/graph_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/guiframe/media/graph_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -1,3 +1,3 @@
-..graph_help.rst
+.. graph_help.rst
 
 .. This is a port of the original SasView html help file to ReSTructured text
@@ -7,34 +7,53 @@
 ====================
 
-1. Graph Menu_
-2. 2D Data Averaging_
-3. Key Combinations_
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. _Graph menu:
+Graph_Menu_
+
+2D_Data_Averaging_
+
+Key_Combinations_
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. _Graph_Menu:
 
 Graph Menu
 ----------
 
-Introduction_ 
-Reset Graph_ 
-Hide/Show/Delete Graph_ 
-Data Info_ 
-Save Plot Image_ 
-Save Data_ 
-Drag Plot_ 
-Zoom In/Out_ 
-Remove Data_ 
-Change Scale_ 
-Linear Fit_ 
-Other Graph Modifications_ 
-
-.. _Introduction: 
+Introduction_
+
+Reset_Graph_
+
+Hide_Show_Delete_Graph_
+
+Data_Info_
+
+Save_Plot_Image_
+
+Save_Data_
+
+Drag_Plot_
+
+Zoom_In_Out_
+
+Remove_Data_
+
+Change_Scale_
+
+Linear_Fit_
+
+Other_Graph_Modifications_
+
+.. _Introduction:
+
+Introduction
+------------
 
 Locating the pointer and right-clicking on a data/theory plot will bring a 
 context menu. On the menu, select a menu item.
 
-.. _Reset Graph: 
+.. _Reset_Graph:
+
+Reset Graph
+-----------
 
 To reset the graph's axis range, right click on the plot and the context menu 
@@ -42,5 +61,8 @@
 the 'home' icon in tool bar will do the same.
 
-.. _Hide/Show/Delete Graph: 
+.. _Hide_Show_Delete_Graph:
+
+Hide/Show/Delete Graph
+----------------------
 
 To Hide, click the Hide (bar) button in the tool bar.To Show, select the the 
@@ -51,5 +73,16 @@
 computation.
 
-.. _Save Plot Image: 
+.. _Data_Info:
+
+Data Info
+---------
+
+From the context menu, select 'Data Info' to see the data information dialog
+panel.
+
+.. _Save_Plot_Image:
+
+Save Plot Image
+---------------
 
 Right click on plot. Context menu will pop-up select save image [file name].
@@ -57,10 +90,8 @@
 *Save Image.*
 
-.. _Data Info: 
-
-From the context menu, select 'Data Info' to see the data information dialog 
-panel.
-
-.. _Save Data: 
+.. _Save_Data:
+
+Save Data
+---------
 
 From the context menu, select 'Save points as a file' for 1D, or 'Save as a 
@@ -68,31 +99,44 @@
 saving.
 
-.. _Drag Plot: 
+.. _Drag_Plot:
+
+Drag Plot
+---------
 
 Select the *crossed arrows*  button on the plot panel *toolbar*  to drag the 
 plot. To disable dragging mode, unselect the same button on the toolbar.
 
-.. _Remove data from plot: 
-
-Highlight the plot and the context menu appears.Select *remove [file name]*. 
+.. _Zoom_In_Out:
+
+Zoom In/Out
+-----------
+
+Select the *rectangle*  button on the plot panel *toolbar*  to zoom in a
+region of the plot.
+
+To disable zoom mode, unselect the same button on the toolbar. After zoom in
+a region, select *left arrow*  or *right arrow*  button on the toolbar to set
+the graph the the previous size. If a mouse wheel button is available,
+*zoom in/out*  by scrolling the mouse wheel (see Key_Combinations_ help for
+details).
+
+.. _Remove_Data:
+
+Remove Data from Plot
+---------------------
+
+Highlight the plot and the context menu appears.Select *remove [file name]*.
 The plot selected will disappear.
 
-.. _Zoom In/Out: 
-
-Select the *rectangle*  button on the plot panel *toolbar*  to zoom in a 
-region of the plot.
-
-To disable zoom mode, unselect the same button on the toolbar. After zoom in 
-a region, select *left arrow*  or *right arrow*  button on the toolbar to set 
-the graph the the previous size. If a mouse wheel button is available, 
-*zoom in/out*  by scrolling the mouse wheel (see Key combination_ help for 
-details).
-
-.. _Change Scale: 
+.. _Change_Scale:
+
+Change Scale
+------------
 
 If the loaded data is a 1-D data changing scale or data representation will 
 work as follows. *Right click* on the plot window. A context menu pops-up and 
 select *Change Scale* . A dialog window titled *select the scale of the graph* 
-will pop-up then change the *x* , the *y*  and the *view*  values as wish. 
+will pop-up then change the *x* , the *y*  and the *view*  values as wish.
+
 The 'view' option includes the axis scale short-cuts such as Linear, Guinier, 
 Cross-sectional (XC) Guinier, and Porod plot scale. For a proper data set, 
@@ -103,53 +147,65 @@
 bar.
 
-.. _Linear Fit: 
-
-Linear fit is to perform a line model fitting keeping the scale of the plot. 
-Highlight data to fit. From the context menu select *Linear Fit* . A dialog 
-window appears. Change model initial parameters, data limits and hit *fit* 
-button. New parameters values are displayed and the line with the new 
-parameters is added to the plot. Especially for Guinier, XC Guinier, and 
-Porod plot scale, this 'Linear Fit' will provides Rg, Rod diameter, and 
-background, respectively. The following figure shows an example for the 
+If the loaded data is an image. *Right click*  on the image to pop-up the
+context menu. Select to switch from linear to log scale. The scale selected is
+printed on the status bar.
+
+.. _Linear_Fit:
+
+Linear Fit
+----------
+
+Linear fit is to perform a line model fitting keeping the scale of the plot.
+Highlight data to fit. From the context menu select *Linear Fit* . A dialog
+window appears. Change model initial parameters, data limits and hit *fit*
+button. New parameters values are displayed and the line with the new
+parameters is added to the plot. Especially for Guinier, XC Guinier, and
+Porod plot scale, this 'Linear Fit' will provides Rg, Rod diameter, and
+background, respectively. The following figure shows an example for the
 Guinier scale.
 
-.. _Change scale
-
-If the loaded data is a 1-D data changing scale or data representation will 
-work as follows. *Right click* on the plot window. A context menu pops-up and 
-select *Change Scale* . A dialog window titled *select the scale of the graph* 
-will pop-up then change the *x* , the *y*  and the *view*  values as wish. 
-If the loaded data is an image. *Right click*  on the image to pop-up the 
-context menu. Select to switch from linear to log scale. The scale selected is 
-printed on the statusbar.
-
 .. image:: guinier_fit.png
 
-.. _Other Graph Modifications: 
+.. _Other_Graph_Modifications:
+
+Other Graph Modifications
+-------------------------
 
 Some custom modifications of the symbols, text, axis, etc of the graph are 
-provided
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. _2D data averaging
+provided.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. _2D_Data_Averaging:
 
 2D Data Averaging
 -----------------
 
-Description_ 
-How to Average_ 
-Available Averagings_
-Perform Circular Average_ 
-Masked Circular Average_ 
-Sector [Q view]_ 
-Annulus [Phi view]_ 
-Box Sum_ 
-Box Averaging in Qx_ 
-Box Averaging in Qy_ 
+Description_
+
+How_to_Average_
+
+Available_Averagings_
+
+Unmasked_Circular_Average_
+
+Masked_Circular_Average_
+
+Sector_Average_
+
+Annular_Average_
+
+Box_Sum_
+
+Box_Averaging_in_Qx_
+
+Box_Averaging_in_Qy_
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
 .. _Description: 
+
+Description
+-----------
 
 This feature allows you to perform different types of averages on your data, 
@@ -158,5 +214,8 @@
 dragging the lines around.
 
-.. _How to Average 
+.. _How_to_Average:
+
+How to Average
+--------------
 
 Right click on 2D data for the context menu to appear. Select one type of 
@@ -180,24 +239,39 @@
 data.The user can also enter values to select a region.
 
-.. _Available Averagings:
-
-???
-
-.. _Perform Circular Average: 
-
-It will perform and average in constant q-rings around the (x,y) pixel 
+.. _Available_Averagings:
+
+Available Averagings
+--------------------
+
+Some different types of averaging are provided for.
+
+.. _Unmasked_Circular_Average:
+
+Unmasked Circular Average
+-------------------------
+
+This operation will perform and average in constant q-rings around the (x,y) pixel
 location of the beam center.
 
-.. _Masked Circular Average: 
-
-This operation is same as 'Perform Circular Average' except that the masked 
+.. _Masked_Circular_Average:
+
+Masked Circular Average
+-----------------------
+
+This operation is same as 'Masked Circular Average' except that the masked
 region is excluded if masked.
 
-.. _Sector [Q view]: 
-
-It averages in constant q-arcs. The width of the sector is specified in 
-degrees (+/- delta phi) each direction from the central angle (phi).
-
-.. _Annulus [Phi view]: 
+.. _Sector_Average:
+
+Sector Average [Q View]
+-----------------------
+
+This operation averages in constant q-arcs. The width of the sector is specified in
+degrees (+/- delta phi) each side of the central angle (phi).
+
+.. _Annular_Average:
+
+Annular Average [Phi View]
+--------------------------
 
 It performs an average between two q-values centered in (0,0), and averaged 
@@ -207,5 +281,8 @@
 outer circle. The angle zero starts from the positive x-axis direction.
 
-.. _Box Sum: 
+.. _Box_Sum:
+
+Box Sum
+-------
 
 Perform the sum of counts in a 2D region of interest.When editing the slicer, 
@@ -213,5 +290,8 @@
 coordinates of the center of this rectangle.
 
-.. _Box Averaging in Qx: 
+.. _Box_Averaging_in_Qx:
+
+Box Averaging in Qx
+-------------------
 
 Computes average I(Qx) for a region of interest. When editing the slicer, the 
@@ -221,5 +301,8 @@
 on the x-axis.
 
-.. _Box Averaging in Qy: 
+.. _Box_Averaging_in_Qy:
+
+Box Averaging in Qy
+-------------------
 
 Computes average I(Qy) for a region of interest.When editing the slicer, the 
@@ -231,16 +314,21 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Key combination
+.. _Key_Combinations:
 
 Key Combination
 ---------------
 
-Floating Panel_ 
-Graph Context Menu_ 
-Zoom In and Out_ 
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. _Floating Panel: 
+Floating_Panel_
+
+Graph_Context_Menu_
+
+Zoom_
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. _Floating_Panel:
+
+Floating Panel
+--------------
 
 For a graph panel to float on the top of the SV window:
@@ -250,5 +338,8 @@
 the menu bar. Otherwise choose 'Dock'.
 
-.. _Graph Context Menu: 
+.. _Graph_Context_Menu:
+
+Graph Context Menu
+------------------
 
 To get the graph context menu to print, copy, save data, (2D)average, etc, 
@@ -256,5 +347,8 @@
 to bring up the full menu.
 
-.. _Zoom In and Out: 
+.. _Zoom:
+
+Zoom In/Out
+-----------
 
 To Zoom in or out the full plot, *locate the mouse point inside the graph 
Index: src/sas/invariant/media/invariant_help.rst
===================================================================
--- src/sas/invariant/media/invariant_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/invariant/media/invariant_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -1,3 +1,3 @@
-..invariant_help.rst
+.. invariant_help.rst
 
 .. This is a port of the original SasView html help file to ReSTructured text
@@ -7,14 +7,19 @@
 =================================
 
-1. Scattering Invariant_
-2. Volume Fraction_
-3. Specific Surface Area_
-4. Definitions_
-5. Reference_
-6. How to Use_
+Scattering_Invariant_
+
+Volume_Fraction_
+
+Specific_Surface_Area_
+
+Definitions_
+
+Reference_
+
+How_to_Use_
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Scattering Invariant:
+.. _Scattering_Invariant:
 
 Scattering Invariant
@@ -77,5 +82,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Volume Fraction:
+.. _Volume_Fraction:
 
 Volume Fraction
@@ -94,5 +99,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Specific Surface Area:
+.. _Specific_Surface_Area:
 
 Specific Surface Area
@@ -106,5 +111,5 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _Definitions
+.. _Definitions:
 
 Definitions
@@ -115,5 +120,5 @@
 I(Q): the scattering intensity as a function of the momentum transfer Q.
 
-Invariant total is the sum of the invariant calculated from datas q range and 
+Invariant total is the sum of the invariant calculated from datas q range and
 the invariant resulting from extrapolation at low q range and at high q range 
 if considered.
@@ -129,9 +134,9 @@
 Press, New York, 1982
 
-http://physchem.kfunigraz.ac.at/sm/ <http://physchem.kfunigraz.ac.at/sm/>_
+http://physchem.kfunigraz.ac.at/sm/
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. _How to Use
+.. _How_to_Use:
 
 How to Use
@@ -149,9 +154,9 @@
 3. If you want to calculate the volume fraction and the specific surface 
 area, type the optional inputs in the customized input box, and then press 
-Compute button.
+'Compute' button.
 
 4. The invariant can also be calculated including the outside of the data Q 
 range:  To include the lower Q and/or the higher Q range, check in the enable 
-extrapolation check box in Extrapolation box. If the power low is chosen, 
+extrapolation check box in 'Extrapolation' box. If the power low is chosen,
 the power (exponent) can be either held or fitted by checking the 
 corresponding radio button.  The Npts that is being used for the extrapolation 
@@ -162,5 +167,5 @@
 proper to calculate the invariant.
 
-6. The details of the calculation is available by clicking the Details 
+6. The details of the calculation is available by clicking the 'Details'
 button in the middle of the panel.
 
Index: src/sas/invariant/media/pr_help.rst
===================================================================
--- src/sas/invariant/media/pr_help.rst	(revision 78f02c3a0e9c508d44cf9f368712e61adf2ae443)
+++ src/sas/invariant/media/pr_help.rst	(revision 23a9beb149c5d0f661ae1295aede00e83e311057)
@@ -1,6 +1,9 @@
-..pr_help.rst
+.. pr_help.rst
 
 .. This is a port of the original SasView html help file to ReSTructured text
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+
+.. |pi| unicode:: U+03C0
+.. |chi| unicode:: U+03C7
 
 P(r) Inversion Perspective
@@ -9,11 +12,11 @@
 The inversion approach is based on Moore, J. Appl. Cryst., (1980) 13, 168-175.
 
-P(r) is set to be equal to an expansion of base functions  of the type 
-phi_n(r) = 2*r*sin(pi*n*r/D_max).
+P(r) is set to be equal to an expansion of base functions of the type
+phi_n(r) = 2 * r * sin(|pi| * n * r / D_max).
 
 The coefficient of each base function in the expansion is found by performing 
 a least square fit with the following fit function:
 
-chi**2 = sum_i[ I_meas(q_i) - I_th(q_i) ]**2/error**2 + Reg_term
+|chi| ^2 = sum_i[ I_meas(q_i) - I_th(q_i) ]^2 / error^2 + Reg_term
 
 where I_meas(q) is the measured scattering intensity and I_th(q) is the 
@@ -21,13 +24,13 @@
 
 The Reg_term term is a regularization term set to the second derivative 
-d**2P(r)/dr**2 integrated over r. It is used to produce a smooth P(r) output.
+d^2 P(r) / dr^2 integrated over r. It is used to produce a smooth P(r) output.
 
 The following are user inputs:
 
-   - Number of terms: the number of base functions in the P(r) expansion. 
+*  Number of terms: the number of base functions in the P(r) expansion.
    
-   - Regularization constant: a multiplicative constant to set the size of 
-the regularization term.
+*  Regularization constant: a multiplicative constant to set the size of
+   the regularization term.
 
-   - Maximum distance: the maximum distance between any two points in the 
+*  Maximum distance: the maximum distance between any two points in the
    system.
