Index: calculatorview/src/sans/perspectives/calculator/data_operator.py
===================================================================
--- calculatorview/src/sans/perspectives/calculator/data_operator.py	(revision 1d490fd7531733e53181805d234489c57f7ce11c)
+++ calculatorview/src/sans/perspectives/calculator/data_operator.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -645,4 +645,7 @@
         self.position = (0.4, 0.5)
         self.scale = 'linear'
+        self.prevXtrans = "x"
+        self.prevYtrans = "y"
+        self.viewModel = "--"
         self.subplot.set_xticks([])
         self.subplot.set_yticks([])
@@ -865,7 +868,5 @@
                 dial.view.Insert("--", 0)
                 dial.view.Insert("Linear y vs x", 1)
-                dial.xvalue.SetValue("x")
-                dial.yvalue.SetValue("y")
-                dial.view.SetValue("--")
+                dial.setValues(self.prevXtrans, self.prevYtrans, self.viewModel)
                 dial.Update()
                 if dial.ShowModal() == wx.ID_OK:
@@ -918,4 +919,6 @@
                 self.graph._yaxis_transformed("%s" % yname, "%s" % yunits)
             item.transformView()
+        self.prevXtrans = self.xLabel
+        self.prevYtrans = self.yLabel
         self.set_xscale(_xscale)
         self.set_yscale(_yscale)
Index: calculatorview/src/sans/perspectives/calculator/model_editor.py
===================================================================
--- calculatorview/src/sans/perspectives/calculator/model_editor.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
+++ calculatorview/src/sans/perspectives/calculator/model_editor.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -628,5 +628,6 @@
         Layout msg
         """
-        self._msg_box = wx.StaticText(self, -1, self._notes)
+        self._msg_box = wx.StaticText(self, -1, self._notes, 
+                                      size=(PANEL_WIDTH, -1))
         self.msg_sizer.Add(self._msg_box, 0, wx.LEFT, 10)  
                     
@@ -717,5 +718,5 @@
         if len(title) > 20:
             s_title = title[0:19] + '...'
-        self._notes += "Model function name set "
+        self._notes += "Model function name is set "
         self._notes += "to %s. \n" % str(s_title)
         return True
@@ -783,5 +784,5 @@
                 pass
         else:
-            msg = "Successful!!!"
+            msg = "Successful! "
             msg += "  " + self._notes
             msg += " Please look for it in the Customized Models."
Index: fittingview/src/sans/perspectives/fitting/basepage.py
===================================================================
--- fittingview/src/sans/perspectives/fitting/basepage.py	(revision ef671451d7622c70977adde06798580581db8bfc)
+++ fittingview/src/sans/perspectives/fitting/basepage.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -3364,4 +3364,5 @@
             self.master_category_dict = pickle.load(cat_file)
             self._regenerate_model_dict()
+            cat_file.close()
 
         except IOError:
Index: fittingview/src/sans/perspectives/fitting/fitting.py
===================================================================
--- fittingview/src/sans/perspectives/fitting/fitting.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
+++ fittingview/src/sans/perspectives/fitting/fitting.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -1795,5 +1795,5 @@
             if new_plot.group_id == None:
                 new_plot.group_id = data.group_id
-            new_plot.id = str(page_id) + "model-" + data.name
+            new_plot.id = str(page_id) + " " + data.name
             #if new_plot.id in self.color_dict:
             #    new_plot.custom_color = self.color_dict[new_plot.id]
@@ -1871,5 +1871,5 @@
         new_plot.name = model.name + '2d'
         new_plot.title = "Analytical model 2D "
-        new_plot.id = str(page_id) + "model-" + data.name
+        new_plot.id = str(page_id) + " " + data.name
         new_plot.group_id = str(page_id) + " Model2D"
         new_plot.detector = data.detector
Index: fittingview/src/sans/perspectives/fitting/models.py
===================================================================
--- fittingview/src/sans/perspectives/fitting/models.py	(revision ea5fa581cac321a89f39dd537af704582947a6a9)
+++ fittingview/src/sans/perspectives/fitting/models.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -19,4 +19,5 @@
 from sans.models.pluginmodel import Model1DPlugin
 from sans.models.BaseComponent import BaseComponent
+from sans.guiframe.CategoryInstaller import CategoryInstaller
    
 PLUGIN_DIR = 'plugin_models'
@@ -937,4 +938,9 @@
     """
     __modelmanager = ModelManagerBase()
+    cat_model_list = [model_name for model_name \
+                      in __modelmanager.model_dictionary.keys() \
+                      if model_name not in __modelmanager.stored_plugins.keys()]
+
+    CategoryInstaller.check_install(model_list=cat_model_list)
     
     def findModels(self):
Index: inversionview/src/sans/perspectives/pr/inversion_panel.py
===================================================================
--- inversionview/src/sans/perspectives/pr/inversion_panel.py	(revision c4ae1c2b432a6bf6349a9358eb5ecf8c79ad3298)
+++ inversionview/src/sans/perspectives/pr/inversion_panel.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -968,7 +968,7 @@
         """
         from sans.pr.invertor import help
-        wx.Dialog.__init__(self, parent, id, size=(400, 420))
+        wx.Dialog.__init__(self, parent, id, size=(400, 450))
         self.SetTitle("P(r) help") 
-        
+        self.SetWindowVariant(variant=FONT_VARIANT)
 
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -976,5 +976,5 @@
         explanation = help()
            
-        label_explain = wx.StaticText(self, -1, explanation, size=(350, 320))
+        label_explain = wx.StaticText(self, -1, explanation, size=(360, 350))
             
         vbox.Add(label_explain, 0, wx.ALL|wx.EXPAND, 15)
Index: inversionview/src/sans/perspectives/pr/inversion_state.py
===================================================================
--- inversionview/src/sans/perspectives/pr/inversion_state.py	(revision 1e623612b055131e7dd0f1395a4ab5fba6f3c104)
+++ inversionview/src/sans/perspectives/pr/inversion_state.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -33,5 +33,6 @@
            ["slit_height",  "height"],
            ["qmin",         "qmin"],
-           ["qmax",         "qmax"]]                      
+           ["qmax",         "qmax"],
+           ["estimate_bck", "estimate_bck"]]                      
 
 ## List of P(r) inversion outputs
Index: plottools/src/danse/common/plottools/PlotPanel.py
===================================================================
--- plottools/src/danse/common/plottools/PlotPanel.py	(revision f866fb50c32dcbfffa94c222dc6afe14b1730c6b)
+++ plottools/src/danse/common/plottools/PlotPanel.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -2,6 +2,5 @@
 """
 import logging
-import wx.lib.newevent
-
+import wx
 # Try a normal import first
 # If it fails, try specifying a version
Index: plottools/src/danse/common/plottools/SimpleFont.py
===================================================================
--- plottools/src/danse/common/plottools/SimpleFont.py	(revision 8f59e95b3001fbd69e1670fadfe4ea035b66a676)
+++ plottools/src/danse/common/plottools/SimpleFont.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -34,10 +34,10 @@
         self.style = STYLE[0]
         self.weight = WEIGHT[1]
-
+        self.tick_label = None
+        self.tick_label_check = None
         self.InitUI()
         self.Centre()
         self.Show()
-
-
+        
     def InitUI(self):
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -57,18 +57,22 @@
         self.fontWeight = wx.ComboBox(self,pos=(300,60),
                                       style=wx.CB_READONLY,size=(100,-1))
-
+        self.tick_label_check = wx.CheckBox(self, -1, label='', pos=(80, 100), 
+										size=(15, -1))
+        self.tick_label_check.SetValue(False)
         self.okButton = wx.Button(self,wx.ID_OK,'OK',pos=(215,100))
         self.closeButton = wx.Button(self,wx.ID_CANCEL,'Cancel',pos=(315,100))
-
+        
         self._set_family_list()
         self._set_style_list()
         self._set_weight_list()
         self._set_point_list()
-
+        
         familyText = wx.StaticText(self, label='Family:', pos=(10,12))
         sizeText = wx.StaticText(self, label='Size:',pos=(220,12))
         styleText = wx.StaticText(self, label='Style:',pos=(10,62))
         weightText = wx.StaticText(self, label='Weight:',pos=(220,62))
-
+        tick_label_text = wx.StaticText(self,label='Tick label?', pos=(10, 100))
+        tick_label_text.SetToolTipString("Apply to tick label too.")
+		
     def _set_family_list(self):
         # list of font family
@@ -95,4 +99,16 @@
             self.fontPoint.Append(str(list[idx]),idx)
 
+    def get_ticklabel_check(self):
+        """
+        Get tick label check value
+        """
+        self.tick_label = self.tick_label_check.GetValue()
+        return self.tick_label
+
+    def set_ticklabel_check(self, check=False):
+        """
+        Set tick label check value
+        """
+        self.tick_label_check.SetValue(check)
 
     def set_default_font(self,font):
@@ -103,16 +119,14 @@
             self.fontPoint.SetSelection(3)
             self.fontStyle.SetSelection(0)
-
         else:
-            self.fontWeight.SetStringSelection(font.get_weight())
-            self.fontPoint.SetStringSelection(font.get_size())
-            self.fontFamily.SetStringSelection(font.get_family())
-            self.fontStyle.SetStringSelection(font.get_style())
-        
-
+        	self.fontWeight.SetStringSelection(str(font.get_weight()))
+        	self.fontPoint.SetStringSelection(str(int(font.get_size())))
+        	self.fontFamily.SetStringSelection(str(font.get_family()[0]))
+        	self.fontStyle.SetStringSelection(str(font.get_style()))
+        	
     def get_font(self):
         FONT = FontProperties()
         font = FONT.copy()
-        font.set_size(self.fontPoint.GetValue())
+        font.set_size(str(self.fontPoint.GetValue()))
         font.set_name(str(self.fontFamily.GetValue()))
         font.set_slant(str(self.fontStyle.GetValue()))
Index: plottools/src/danse/common/plottools/TextDialog.py
===================================================================
--- plottools/src/danse/common/plottools/TextDialog.py	(revision 10bfeb307197dbe02c1ab9ca2e868b076c0cd128)
+++ plottools/src/danse/common/plottools/TextDialog.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -97,5 +97,5 @@
         self.fontSize.SetMinSize((_BOX_WIDTH, -1))
         self._set_size_list()
-        self.fontSize.SetSelection(3)
+        self.fontSize.SetSelection(5)
         self.fontSize.SetToolTipString("Font size of the text.")
         #font style
Index: sansguiframe/src/sans/guiframe/CategoryInstaller.py
===================================================================
--- sansguiframe/src/sans/guiframe/CategoryInstaller.py	(revision dad7cefa5ce1c68624b46df57bcb5b00ade2d254)
+++ sansguiframe/src/sans/guiframe/CategoryInstaller.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -123,6 +123,5 @@
         
     @staticmethod
-    def check_install(homedir = None, defaultfile = None,
-                      modelsdir = None, installed_models_dir = None):
+    def check_install(homedir = None, model_list=None):
         """
         the main method of this class
@@ -130,92 +129,52 @@
         compile it and install
         :param homefile: Override the default home directory
-        :param defaultfile: Override the default file location
-        :param modelsfile: The file where models.py lives. This
-        MUST be overwritten in setup.py
-        :param installed_models_dir: Where installed_models.txt is to go:
+        :param model_list: List of model names except customized models
         """
-        model_list = []
+        #model_list = []
+        default_file = CategoryInstaller.get_default_file()
         serialized_file = None
+        master_category_dict = defaultdict(list)
         if homedir == None:
             serialized_file = CategoryInstaller.get_user_file()
         else:
             serialized_file = os.path.join(homedir, USER_FILE)
-
-        if os.path.exists(serialized_file):
-            return
-
-        if installed_models_dir == None:
-            installed_models_dir = \
-                CategoryInstaller._get_installed_model_dir() 
+        if os.path.isfile(serialized_file):
+            cat_file = open(serialized_file, 'rb')
+        else:
+            cat_file = open(default_file, 'rb')
+        master_category_dict = pickle.Unpickler(cat_file).load()
+        (by_model_dict, model_enabled_dict) = \
+                CategoryInstaller._regenerate_model_dict(master_category_dict)
+        cat_file.close()
+        add_list = model_list
+        del_name = False
+        for cat in master_category_dict.keys():
+            for ind in range(len(master_category_dict[cat])):
+                model_name, enabled = master_category_dict[cat][ind]
+                if model_name not in model_list:
+                    del_name = True 
+                    try:
+                        by_model_dict.pop(model_name)
+                        model_enabled_dict.pop(model_name)
+                    except:
+                        pass
+                else:
+                    add_list.remove(model_name)
+        if del_name or (len(add_list) > 0):
+            for model in add_list:
+                model_enabled_dict[model]= True
+                by_model_dict[model].append('Uncategorized')
+    
+            master_category_dict = \
+                CategoryInstaller._regenerate_master_dict(by_model_dict,
+                                                          model_enabled_dict)
+            
+            pickle.dump( master_category_dict,
+                         open(serialized_file, 'wb') )
+            
+            try:
+                #It happens only in source environment
+                shutil.copyfile(serialized_file, default_file)
+            except:
+                pass
         
-        installed_model_file = open(
-            os.path.join(installed_models_dir,
-                         "installed_models.txt"), 'w')
-
-        if modelsdir == None:
-            modelsdir = CategoryInstaller._get_models_py_dir()
-        python_model_file = open(os.path.join(modelsdir, 
-                                              "models.py"),
-                                 'r')
-
-        python_models = python_model_file.read()
-        
-        # we remove models that appear in the installed
-        # model folder but not in models.py . the excess
-        # hard coded ones on the end come from them being
-        # present in models.py but not actual models, eg
-        # TwoLorenzianModel contains the string 'Lorenzian'
-        # but we don't actually want to include Lorenzian
-        model_list = [mod for mod in model_list if \
-                          mod in python_models and \
-                          not 'init' in mod and \
-                          not 'BaseComponent' in mod \
-                          and not 'MultiplicationModel' in mod \
-                          and not 'pluginmodel' in mod \
-                          and mod != 'PowerLawModel' \
-                          and mod != 'Lorentzian']
-
-        
-        for mod in model_list:
-            installed_model_file.write(mod + '\n')
-        
-        installed_model_file.close()
-
-        # start sorting category stuff
-        default_file = None
-        if defaultfile == None:
-            default_file = CategoryInstaller.get_default_file()
-        else:
-            default_file = defaultfile
-
-        master_category_dict = pickle.load(open(default_file, 'rb'))
-        
-        (by_model_dict, model_enabled_dict) = \
-            CategoryInstaller._regenerate_model_dict(master_category_dict)
-            
-            
-        for found_model in model_list:
-            if not found_model in by_model_dict:
-                print found_model + ' : ' + str(by_model_dict[found_model]) 
-                by_model_dict[found_model].append("Uncategorized")
-                model_enabled_dict[found_model] = True
-
-                # remove any stray models from categorization 
-                # that aren't stored anymore
-
-        models_to_delete = []
-        for model in by_model_dict:
-            if not model in model_list:
-                models_to_delete.append(model)
-
-        for model in models_to_delete:
-            by_model_dict.pop(model)
-
-        master_category_dict = \
-            CategoryInstaller._regenerate_master_dict(by_model_dict,
-                                                      model_enabled_dict)
-        
-        pickle.dump( master_category_dict,
-                     open(default_file, 'wb') )
-
-        #shutil.copyfile(default_file, serialized_file)
Index: sansguiframe/src/sans/guiframe/CategoryManager.py
===================================================================
--- sansguiframe/src/sans/guiframe/CategoryManager.py	(revision 6034e16d3c4bf8c0887c2ca2c4b8845b6fa73adb)
+++ sansguiframe/src/sans/guiframe/CategoryManager.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -96,5 +96,5 @@
         self.model_enabled_dict = defaultdict(bool)
 
-        wx.Frame.__init__(self, parent, win_id, title, size=(650, 400))
+        wx.Frame.__init__(self, parent, win_id, title, size=(660, 400))
 
         panel = wx.Panel(self, -1)
@@ -299,5 +299,6 @@
 
         pickle.dump( self.master_category_dict, cat_file )
-
+        
+        cat_file.close()
    
     def _read_category_info(self):
@@ -313,4 +314,5 @@
 	        	cat_file = open(CategoryInstaller.get_default_file(), 'rb')
         		self.master_category_dict = pickle.load(cat_file)
+        	cat_file.close()
         except IOError:
             print 'Problem reading in category file. Please review'
Index: sansguiframe/src/sans/guiframe/aboutbox.py
===================================================================
--- sansguiframe/src/sans/guiframe/aboutbox.py	(revision 1452132b4bed83bc5649d29d37566cc7ea80993c)
+++ sansguiframe/src/sans/guiframe/aboutbox.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -107,8 +107,13 @@
         self.bitmap_button_umd = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_sns = wx.BitmapButton(self, -1, wx.NullBitmap)
-        self.bitmap_button_nsf = wx.BitmapButton(self, -1,
-                                                 wx.NullBitmap)
-        self.bitmap_button_danse = wx.BitmapButton(self, -1, wx.NullBitmap)
+        #self.bitmap_button_nsf = wx.BitmapButton(self, -1,
+        #                                         wx.NullBitmap)
+        #self.bitmap_button_danse = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_msu = wx.BitmapButton(self, -1, wx.NullBitmap)
+        
+        self.bitmap_button_isis = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_ess = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_ill = wx.BitmapButton(self, -1, wx.NullBitmap)
+        
         self.static_line_3 = wx.StaticLine(self, -1)
         self.button_OK = wx.Button(self, wx.ID_OK, "OK")
@@ -120,7 +125,10 @@
         self.Bind(wx.EVT_BUTTON, self.onUmdLogo, self.bitmap_button_umd)
         self.Bind(wx.EVT_BUTTON, self.onSnsLogo, self.bitmap_button_sns)
-        self.Bind(wx.EVT_BUTTON, self.onNsfLogo, self.bitmap_button_nsf)
-        self.Bind(wx.EVT_BUTTON, self.onDanseLogo, self.bitmap_button_danse)
+        #self.Bind(wx.EVT_BUTTON, self.onNsfLogo, self.bitmap_button_nsf)
+        #self.Bind(wx.EVT_BUTTON, self.onDanseLogo, self.bitmap_button_danse)
         self.Bind(wx.EVT_BUTTON, self.onUTLogo, self.bitmap_button_msu)
+        self.Bind(wx.EVT_BUTTON, self.onIsisLogo, self.bitmap_button_isis)
+        self.Bind(wx.EVT_BUTTON, self.onEssLogo, self.bitmap_button_ess)
+        self.Bind(wx.EVT_BUTTON, self.onIllLogo, self.bitmap_button_ill)
         # end wxGlade
         # fill in acknowledgements
@@ -162,4 +170,5 @@
         self.bitmap_button_sns.SetBitmapLabel(logo)
         
+        """
         image = file_dir + "/images/nsf_logo.png"
         if os.path.isfile(config._nsf_logo):
@@ -173,5 +182,5 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_danse.SetBitmapLabel(logo)
-        
+        """
         image = file_dir + "/images/utlogo.gif"
         if os.path.isfile(config._inst_logo):
@@ -180,4 +189,22 @@
         self.bitmap_button_msu.SetBitmapLabel(logo)
         
+        image = file_dir + "/images/isis_logo.png"
+        if os.path.isfile(config._isis_logo):
+            image = config._isis_logo
+        logo = wx.Bitmap(image)        
+        self.bitmap_button_isis.SetBitmapLabel(logo)
+
+        image = file_dir + "/images/ess_logo.png"
+        if os.path.isfile(config._ess_logo):
+            image = config._ess_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_ess.SetBitmapLabel(logo)
+        
+        image = file_dir + "/images/ill_logo.png"
+        if os.path.isfile(config._ill_logo):
+            image = config._ill_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_ill.SetBitmapLabel(logo)
+                
         # resize dialog window to fit version number nicely
         if wx.VERSION >= (2, 7, 2, 0):
@@ -201,7 +228,10 @@
         self.bitmap_button_umd.SetSize(self.bitmap_button_umd.GetBestSize())
         self.bitmap_button_sns.SetSize(self.bitmap_button_sns.GetBestSize())
-        self.bitmap_button_nsf.SetSize(self.bitmap_button_nsf.GetBestSize())
-        self.bitmap_button_danse.SetSize(self.bitmap_button_danse.GetBestSize())
+        #self.bitmap_button_nsf.SetSize(self.bitmap_button_nsf.GetBestSize())
+        #self.bitmap_button_danse.SetSize(self.bitmap_button_danse.GetBestSize())
         self.bitmap_button_msu.SetSize(self.bitmap_button_msu.GetBestSize())
+        self.bitmap_button_isis.SetSize(self.bitmap_button_isis.GetBestSize())
+        self.bitmap_button_ess.SetSize(self.bitmap_button_ess.GetBestSize())
+        self.bitmap_button_ill.SetSize(self.bitmap_button_ill.GetBestSize())
         # end wxGlade
 
@@ -244,17 +274,30 @@
                        wx.LEFT|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 7)
         sizer_main.Add(self.static_line_2, 0, wx.EXPAND, 0)
-        sizer_logos.Add(self.bitmap_button_nist, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_umd, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_sns, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_nsf, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_danse, 0,
-                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_msu, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add((50, 50), 0, wx.ADJUST_MINSIZE, 0)
+
+        sizer_logos.Add(self.bitmap_button_msu, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        #sizer_logos.Add(self.bitmap_button_danse, 0,
+        #                wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        #sizer_logos.Add(self.bitmap_button_nsf, 0, 
+        #                wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_umd, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_nist, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_sns, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_isis, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_ess, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_ill, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+                
+        sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0)
         sizer_main.Add(sizer_logos, 0, wx.EXPAND, 0)
         sizer_main.Add(self.static_line_3, 0, wx.EXPAND, 0)
-        sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        sizer_button.Add((20, 40), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         sizer_button.Add(self.button_OK, 0, 
-                         wx.RIGHT|wx.ADJUST_MINSIZE|wx.BOTTOM, 10)
+                         wx.RIGHT|wx.ADJUST_MINSIZE|wx.CENTER, 10)
         sizer_main.Add(sizer_button, 0, wx.EXPAND, 0)
         self.SetAutoLayout(True)
@@ -306,4 +349,25 @@
         event.Skip()
 
+    def onIsisLogo(self, event): 
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._isis_url)
+        event.Skip()
+
+    def onEssLogo(self, event):
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._ess_url)
+        event.Skip()
+
+    def onIllLogo(self, event):
+        """
+        """ 
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._ill_url)
+        event.Skip()
+
 # end of class DialogAbout
 
Index: sansguiframe/src/sans/guiframe/config.py
===================================================================
--- sansguiframe/src/sans/guiframe/config.py	(revision 6e48fd0cd19552c31460f3fabb27952ef7f3ff8f)
+++ sansguiframe/src/sans/guiframe/config.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -9,6 +9,7 @@
 __version__ = '0.0.0'
 __build__ = '1'
-__download_page__ = 'https://sourceforge.net/projects/sansviewproject/files/'
-__update_URL__ = 'http://sansviewproject.svn.sourceforge.net/viewvc/sansviewproject/trunk/sansview.latestversion'
+__download_page__ = 'http://sourceforge.net/projects/sasview/files/'
+__update_URL__ = ['svn.code.sf.net', 
+                  '/p/sasview/code/trunk/sansview.latestversion']
 
 
@@ -32,9 +33,9 @@
 
 '''
-_homepage = "http://danse.chem.utk.edu"
-_download = "http://danse.chem.utk.edu/sansview.html"
+_homepage = "http://www.sasview.org"
+_download = "http://sourceforge.net/projects/sasview/files/"
 _authors = []
-_paper = "http://danse.us/trac/sans/newticket"
-_license = "mailto:sansdanse@gmail.com"
+_paper = "http://sourceforge.net/p/sasview/tickets/"
+_license = "mailto:help@sasview.org"
 _nsf_logo = "images/nsf_logo.png"
 _danse_logo = "images/danse_logo.png"
@@ -43,4 +44,7 @@
 _umd_logo = "images/umd_logo.png"
 _sns_logo = "images/sns_logo.png"
+_isis_logo = "images/isis_logo.png"
+_ess_logo = "images/ess_logo.png"
+_ill_logo = "images/ill_logo.png"
 _nist_url = "http://www.nist.gov/"
 _umd_url = "http://www.umd.edu/"
@@ -49,4 +53,7 @@
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
+_isis_url = "http://www.isis.stfc.ac.uk/"
+_ess_url = "http://ess-scandinavia.eu/"
+_ill_url = "http://www.ill.eu/"
 _corner_image = "images/angles_flat.png"
 _welcome_image = "images/SVwelcome.png"
Index: sansguiframe/src/sans/guiframe/data_manager.py
===================================================================
--- sansguiframe/src/sans/guiframe/data_manager.py	(revision 709cd834ef21173d0c49461d67a550c281cdc837)
+++ sansguiframe/src/sans/guiframe/data_manager.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -251,5 +251,6 @@
                 if theory_id in theory_list.keys():
                     del theory_list[theory_id]
-        
+        #del pure theory
+        self.delete_by_id(theory_id)
             
     def delete_by_id(self, id_list=None):
Index: sansguiframe/src/sans/guiframe/data_panel.py
===================================================================
--- sansguiframe/src/sans/guiframe/data_panel.py	(revision 4cc25e9e1767d18bc6339a3b48d8dc8341a61a45)
+++ sansguiframe/src/sans/guiframe/data_panel.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -35,4 +35,6 @@
 from sans.guiframe.events import NewBatchEvent
 from sans.dataloader.loader import Loader
+from sans.guiframe.local_perspectives.plotting.masking \
+    import FloatPanel as QucikPlotDialog
 
 import sans.guiframe.config as config
@@ -442,6 +444,4 @@
         """
         data = self._get_data_selection(event)
-        from sans.guiframe.local_perspectives.plotting.masking \
-        import FloatPanel as QucikPlotDialog
         if data.__class__.__name__ == "Data2D":
             dimension = 2
Index: sansguiframe/src/sans/guiframe/gui_manager.py
===================================================================
--- sansguiframe/src/sans/guiframe/gui_manager.py	(revision ef671451d7622c70977adde06798580581db8bfc)
+++ sansguiframe/src/sans/guiframe/gui_manager.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -23,5 +23,6 @@
 warnings.simplefilter("ignore")
 import logging
-import urllib2
+#import urllib2
+import httplib
 
 from sans.guiframe.events import EVT_CATEGORY
@@ -2254,7 +2255,13 @@
         """
         try:
-            f=urllib2.urlopen(config.__update_URL__, 
-                              timeout=1.0)
-            content = f.read()
+            conn = httplib.HTTPConnection(config.__update_URL__[0], 
+                              timeout=3.0)
+            conn.request("GET", config.__update_URL__[1])
+            res = conn.getresponse()
+            content = res.read()
+            conn.close()
+            #f=urllib2.urlopen(config.__update_URL__, 
+            #                  timeout=1.0)
+            #content = f.read()
         except:
             content = "0.0.0"
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py	(revision f866fb50c32dcbfffa94c222dc6afe14b1730c6b)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -84,4 +84,6 @@
         self.currColorIndex = ""
         self._is_changed_legend_label = False
+        self.is_xtick = False
+        self.is_ytick = False
       
         self.hide_menu = None
@@ -684,5 +686,6 @@
                                   find_key(self.get_loc_label(), 
                                   self.legendLoc), 
-                                  self.xcolor,self.ycolor)
+                                  self.xcolor, self.ycolor, 
+                                  self.is_xtick, self.is_ytick)
         self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
     
@@ -706,9 +709,19 @@
         self.xaxis_unit = graph_app.get_xunit()
         self.yaxis_unit = graph_app.get_yunit()
+        self.xaxis_font = graph_app.get_xfont()
+        self.yaxis_font = graph_app.get_yfont()
+        self.is_xtick =  graph_app.get_xtick_check()
+        self.is_ytick =  graph_app.get_ytick_check()
+        if self.is_xtick:
+            self.xaxis_tick = self.xaxis_font
+        if self.is_ytick:
+            self.yaxis_tick = self.yaxis_font
 
         self.xaxis(self.xaxis_label, self.xaxis_unit, 
-                   graph_app.get_xfont(), graph_app.get_xcolor())
+                   graph_app.get_xfont(), graph_app.get_xcolor(), 
+                   self.xaxis_tick)
         self.yaxis(self.yaxis_label, self.yaxis_unit, 
-                   graph_app.get_yfont(), graph_app.get_ycolor())
+                   graph_app.get_yfont(), graph_app.get_ycolor(),
+                   self.yaxis_tick)
 
         graph_app.Destroy()
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py	(revision 294a7bcae13b384cc517d82e01d0d9a5756bcce1)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -418,5 +418,8 @@
         Edit legend label
         """
-        selected_plot = self.plots[self.graph.selected_plottable]
+        try:
+            selected_plot = self.plots[self.graph.selected_plottable]
+        except:
+            selected_plot = self.plots[self.data2D.id]
         label = selected_plot.label
         dial = TextDialog(None, -1, 'Change Label', label)
@@ -638,5 +641,5 @@
         new_plot.id = "Circ avg " + self.data2D.name
         new_plot.is_data = True
-        self.parent.update_theory(data_id=self.data2D, \
+        self.parent.update_theory(data_id=self.data2D.id, \
                                        theory=new_plot)
         wx.PostEvent(self.parent, 
@@ -792,5 +795,6 @@
                                   self.xaxis_font,self.yaxis_font,
                                   find_key(self.get_loc_label(),self.legendLoc),
-                                  self.xcolor,self.ycolor)
+                                  self.xcolor,self.ycolor,
+                                   self.is_xtick, self.is_ytick)
         self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
     
@@ -807,9 +811,19 @@
         self.xaxis_unit = self.graphApp.get_xunit()
         self.yaxis_unit = self.graphApp.get_yunit()
-
-        self.xaxis(self.xaxis_label,self.xaxis_unit,
-                   self.graphApp.get_xfont(),self.graphApp.get_xcolor())
-        self.yaxis(self.yaxis_label,self.yaxis_unit,
-                   self.graphApp.get_yfont(),self.graphApp.get_ycolor())
+        self.xaxis_font = self.graphApp.get_xfont()
+        self.yaxis_font = self.graphApp.get_yfont()
+        self.is_xtick =  self.graphApp.get_xtick_check()
+        self.is_ytick =  self.graphApp.get_ytick_check()
+        if self.is_xtick:
+            self.xaxis_tick = self.xaxis_font
+        if self.is_ytick:
+            self.yaxis_tick = self.yaxis_font
+
+        self.xaxis(self.xaxis_label, self.xaxis_unit, 
+                   self.graphApp.get_xfont(), self.graphApp.get_xcolor(), 
+                   self.xaxis_tick)
+        self.yaxis(self.yaxis_label, self.yaxis_unit, 
+                   self.graphApp.get_yfont(), self.graphApp.get_ycolor(),
+                   self.yaxis_tick)
 
         self.graphApp.Destroy()
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py	(revision 4752c3147b9fc43a430792f9b3b9dc74c64e094a)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/SectorSlicer.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -186,5 +186,5 @@
         new_plot.id = "SectorQ" + self.base.data2D.name
         new_plot.is_data = True
-        self.base.parent.update_theory(data_id=data, \
+        self.base.parent.update_theory(data_id=data.id, \
                                        theory=new_plot)
         wx.PostEvent(self.base.parent, NewPlotEvent(plot=new_plot,
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py	(revision 9f51c2c49d3f518e89de3963f9add05a17bdce46)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/graphAppearance.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -36,4 +36,6 @@
         self.xfont = None
         self.yfont = None
+        self.is_xtick = False
+        self.is_ytick = False
 
 
@@ -172,6 +174,8 @@
         fonty = SimpleFont(self, wx.NewId(), title)
         fonty.set_default_font(self.xfont)
+        fonty.set_ticklabel_check(self.is_xtick)
         if(fonty.ShowModal() == wx.ID_OK):
             self.xfont = fonty.get_font()
+            self.is_xtick = fonty.get_ticklabel_check()
 
     def onyFont(self, e):
@@ -179,6 +183,8 @@
         fonty = SimpleFont(self, wx.NewId(), title)
         fonty.set_default_font(self.yfont)
+        fonty.set_ticklabel_check(self.is_ytick)
         if(fonty.ShowModal() == wx.ID_OK):
             self.yfont = fonty.get_font()
+            self.is_ytick = fonty.get_ticklabel_check()
 
     def on_ok(self, e):
@@ -233,5 +239,5 @@
     def setDefaults(self,grid,legend,xlab,ylab,xunit,yunit,
                     xaxis_font,yaxis_font,legend_loc,
-                    xcolor,ycolor):
+                    xcolor,ycolor, is_xtick, is_ytick):
         self.toggle_grid.SetValue(grid)
         if self.legend:
@@ -243,4 +249,6 @@
         self.xfont = xaxis_font
         self.yfont = yaxis_font
+        self.is_xtick = is_xtick
+        self.is_ytick = is_ytick
 
         if not xcolor:
@@ -303,4 +311,10 @@
         return self.yfont
     
+    def get_xtick_check(self):
+        return self.is_xtick
+
+    def get_ytick_check(self):
+        return self.is_ytick
+    
 
 if __name__ == '__main__':
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py	(revision 3f68e939ef77954756e418f18f78459a2fa0d251)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -558,4 +558,6 @@
                                            style=wx.TRANSPARENT_WINDOW)
             self.plotpanel._SetInitialSize()
+            self.plotpanel.prevXtrans = "x"
+            self.plotpanel.prevYtrans = "y"
             
             self.cmap = DEFAULT_CMAP
Index: sansguiframe/src/sans/guiframe/local_perspectives/plotting/profile_dialog.py
===================================================================
--- sansguiframe/src/sans/guiframe/local_perspectives/plotting/profile_dialog.py	(revision 808da5e5627f244c2241746d12acb781e1e39abb)
+++ sansguiframe/src/sans/guiframe/local_perspectives/plotting/profile_dialog.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -213,4 +213,7 @@
         self.window_name = "Scattering Length Density Profile"
         self.window_caption = self.window_name
+        self.prevXtrans = "x"
+        self.prevYtrans = "y"
+        self.viewModel = "--"
         # Internal list of plottable names (because graph 
         # doesn't have a dictionary of handles for the plottables)
Index: sansguiframe/src/sans/guiframe/startup_configuration.py
===================================================================
--- sansguiframe/src/sans/guiframe/startup_configuration.py	(revision 6306f2f639a273e7a698e0d6b26872deb4bf2777)
+++ sansguiframe/src/sans/guiframe/startup_configuration.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -84,6 +84,6 @@
         current_bt.SetValue(False)
         current_bt.Bind(wx.EVT_RADIOBUTTON, self.OnCurrent)
-        msg = "\nThis new configuration will take effect after\n"
-        msg += "restarting the SansView application..."
+        msg = "\nThis new configuration will take effect when\n"
+        msg += "running this application next time."
         note_txt = wx.StaticText(panel, -1, msg, (15, 75))
         note_txt.SetForegroundColour("black")
Index: sansmodels/src/sans/models/media/model_functions.html
===================================================================
--- sansmodels/src/sans/models/media/model_functions.html	(revision b71a53b341c545d3723f00a89fb361a67d61cce3)
+++ sansmodels/src/sans/models/media/model_functions.html	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -8,5 +8,5 @@
 <li style="line-height: 115%;"><a href="#Introduction"><strong>Introduction</strong></a></li>
 <li style="line-height: 115%;"><a href="#Shapes"><strong>Shapes</strong></a>: <a href="#SphereModel">SphereModel</a>, <a href="#BinaryHSModel">BinaryHSModel</a>, <a href="#FuzzySphereModel">FuzzySphereModel</a>, <a href="#RaspBerryModel">RaspBerryModel</a>, <a href="#CoreShellModel">CoreShellModel</a>,&nbsp;<a href="#Core2ndMomentModel">Core2ndMomentModel</a>, <a href="#CoreMultiShellModel">CoreMultiShellModel</a>, <a href="#VesicleModel">VesicleModel</a>, <a href="#MultiShellModel">MultiShellModel</a>, &nbsp;<a href="#OnionExpShellModel">OnionExpShellModel</a>, <a href="#SphericalSLDModel">SphericalSLDModel</a>, <a href="#LinearPearlsModel">LinearPearlsModel</a>, <a href="#PearlNecklaceModel">PearlNecklaceModel</a> , <a href="#CylinderModel">CylinderModel</a>, <a href="#CoreShellCylinderModel">CoreShellCylinderModel</a>, <a href="#CoreShellBicelleModel">CoreShellBicelleModel</a>,<a href="#HollowCylinderModel">HollowCylinderModel</a>, <a href="#FlexibleCylinderModel">FlexibleCylinderModel</a>, <a href="#FlexibleCylinderModel">FlexCylEllipXModel</a>, <a href="#StackedDisksModel">StackedDisksModel</a>, <a href="#ParallelepipedModel">ParallelepipedModel</a>, <a href="#CSParallelepipedModel">CSParallelepipedModel</a>, <a href="#EllipticalCylinderModel">EllipticalCylinderModel</a>, <a href="#BarBellModel">BarBellModel</a>, <a href="#CappedCylinderModel">CappedCylinderModel</a>, <a href="#EllipsoidModel">EllipsoidModel</a>, <a href="#CoreShellEllipsoidModel">CoreShellEllipsoidModel</a>, <a href="#TriaxialEllipsoidModel">TriaxialEllipsoidModel</a>, <a href="#LamellarModel">LamellarModel</a>, <a href="#LamellarFFHGModel">LamellarFFHGModel</a>, <a href="#LamellarPSModel">LamellarPSModel</a>, <a href="#LamellarPSHGModel">LamellarPSHGModel</a>, <a href="#LamellarPCrystalModel">LamellarPCrystalModel</a>, <a href="#SCCrystalModel">SCCrystalModel</a>, <a href="#FCCrystalModel">FCCrystalModel</a>, <a href="#BCCrystalModel">BCCrystalModel</a>.</li>
-<li style="line-height: 115%;"><a href="#Shape-Independent"><strong>Shape-Independent</strong></a>: <a href="#Absolute%20Power_Law">AbsolutePower_Law</a>, <a href="#BEPolyelectrolyte">BEPolyelectrolyte</a>, <a href="#BroadPeakModel">BroadPeakModel,<span><span style="text-decoration: underline;"><span style="color: blue;">CorrLength</span></span></span><span>,</span></a> <a href="#DAB_Model">DAB_Model</a>, <a href="#Debye">Debye</a>, <a href="#Number_Density_Fractal">FractalModel</a>, <a href="#FractalCoreShell">FractalCoreShell</a>, <a href="#GaussLorentzGel">GaussLorentzGel</a>, <a href="#Guinier">Guinier</a>, <a href="#GuinierPorod">GuinierPorod</a>, <a href="#Lorentz">Lorentz</a>, <a href="#Mass_Fractal">MassFractalModel</a>, <a href="#MassSurface_Fractal">MassSurfaceFractal</a>, <a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, <a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, <a href="#Poly_GaussCoil">Poly_GaussCoil</a>, <a href="#PolymerExclVolume">PolyExclVolume</a>, <a href="#PorodModel">PorodModel</a>, <a href="#RPA10Model">RPA10Model</a>, <a href="#StarPolymer">StarPolymer</a>, <a href="#Surface_Fractal">SurfaceFractalModel</a>, <a href="#Teubner%20Strey">Teubner Strey</a>, <a href="#TwoLorentzian">TwoLorentzian</a>, <a href="#TwoPowerLaw">TwoPowerLaw</a>, <a href="#UnifiedPowerRg">UnifiedPowerRg</a>, <a href="#LineModel">LineModel</a>, <a href="#ReflectivityModel">ReflectivityModel</a>, <a href="#ReflectivityIIModel">ReflectivityIIModel</a>, <a href="#GelFitModel">GelFitModel</a>.</li>
+<li style="line-height: 115%;"><a href="#Shape-Independent"><strong>Shape-Independent</strong></a>: <a href="#Absolute%20Power_Law">AbsolutePower_Law</a>, <a href="#BEPolyelectrolyte">BEPolyelectrolyte</a>, <a href="#BroadPeakModel">BroadPeakModel,<span><span style="text-decoration: underline;"><span style="color: blue;">CorrLength</span></span></span><span>,</span></a> <a href="#DABModel">DAB_Model</a>, <a href="#Debye">Debye</a>, <a href="#Number_Density_Fractal">FractalModel</a>, <a href="#FractalCoreShell">FractalCoreShell</a>, <a href="#GaussLorentzGel">GaussLorentzGel</a>, <a href="#Guinier">Guinier</a>, <a href="#GuinierPorod">GuinierPorod</a>, <a href="#Lorentz">Lorentz</a>, <a href="#Mass_Fractal">MassFractalModel</a>, <a href="#MassSurface_Fractal">MassSurfaceFractal</a>, <a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, <a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, <a href="#Poly_GaussCoil">Poly_GaussCoil</a>, <a href="#PolymerExclVolume">PolyExclVolume</a>, <a href="#PorodModel">PorodModel</a>, <a href="#RPA10Model">RPA10Model</a>, <a href="#StarPolymer">StarPolymer</a>, <a href="#Surface_Fractal">SurfaceFractalModel</a>, <a href="#TeubnerStreyModel">Teubner Strey</a>, <a href="#TwoLorentzian">TwoLorentzian</a>, <a href="#TwoPowerLaw">TwoPowerLaw</a>, <a href="#UnifiedPowerRg">UnifiedPowerRg</a>, <a href="#LineModel">LineModel</a>, <a href="#ReflectivityModel">ReflectivityModel</a>, <a href="#ReflectivityIIModel">ReflectivityIIModel</a>, <a href="#GelFitModel">GelFitModel</a>.</li>
 <li style="line-height: 115%;"><a href="#Model"><strong>Customized Models</strong></a>: <a href="#testmodel">testmodel</a>, <a href="#testmodel_2">testmodel_2</a>, <a href="#sum_p1_p2">sum_p1_p2</a>, <a href="#sum_Ap1_1_Ap2">sum_Ap1_1_Ap2</a>, <a href="#polynomial5">polynomial5</a>, <a href="#sph_bessel_jn">sph_bessel_jn</a>.</li>
 <li style="line-height: 115%;"><a href="#Structure_Factors"><strong>Structure Factors</strong></a>: <a href="#HardsphereStructure">HardSphereStructure</a>, <a href="#SquareWellStructure">SquareWellStructure</a>, <a href="#HayterMSAStructure">HayterMSAStructure</a>, <a href="#StickyHSStructure">StickyHSStructure</a>.</li>
@@ -242,4 +242,5 @@
 <p>where the amplitude A(q) is given as the typical sphere scattering convoluted with a Gaussian to get a gradual drop-off in the scattering length density:</p>
 <p style="text-align: center;" align="center"><span style="position: relative; top: 18pt;"><img src="img/image011.PNG" alt="" /></span></p>
+<br>
 <p>Here A2(q) is the form factor, P(q). The &lsquo;scale&rsquo; is equivalent to the volume fraction of spheres, each of volume, V. Contrast (<em><span style="font-family: 'Arial','sans-serif';">&Delta;</span>&rho;</em> ) is the difference of scattering length densities of the sphere and the surrounding solvent.</p>
 <p>The poly-dispersion in radius and in fuzziness is provided.</p>
@@ -4937,5 +4938,5 @@
 <p style="text-align: center;" align="center"><strong><span style="font-size: 14pt;"><img id="Picture 75" src="img/image179.jpg" alt="" /></span></strong></p>
 <p style="text-align: center;" align="center"><strong><span style="font-size: 14pt;">&nbsp;</span>Figure. 1D plot using the default values (w/200 data point).</strong></p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><strong><span style="font-size: 14pt;">3.5.</span></strong><strong><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></strong><strong><span style="font-size: 14pt;">&nbsp;<a name="DAB_Model"></a>DAB (Debye-Anderson-Brumberger)_Model</span></strong></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><strong><span style="font-size: 14pt;">3.5.</span></strong><strong><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></strong><strong><span style="font-size: 14pt;">&nbsp;<a name="DABModel"></a>DAB (Debye-Anderson-Brumberger)_Model</span></strong></p>
 <p style="margin-left: 0.55in;"><strong><span style="font-size: 14pt;">&nbsp;</span></strong></p>
 <p style="margin-left: 0.25in;">Calculates the scattering from a randomly distributed, two-phase system based on the Debye-Anderson-Brumberger (DAB) model for such systems. The two-phase system is characterized by a single length scale, the correlation length, which is a measure of the average spacing between regions of phase 1 and phase 2. The model also assumes smooth interfaces between the phases and hence exhibits Porod behavior (I ~ Q-4) at large Q (Q*correlation length &gt;&gt; 1).</p>
@@ -5060,5 +5061,5 @@
 <p style="text-align: center;" align="center"><img id="Picture 77" src="img/image183.jpg" alt="" /></p>
 <p style="text-align: center;" align="center"><strong>Figure. 1D plot using the default values (w/200 data point).</strong></p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><strong><span style="font-size: 14pt;">3.7.</span></strong><strong><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></strong><strong><span style="font-size: 14pt;">&nbsp;<a name="Teubner Strey"></a>Teubner Strey (Model)</span></strong></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><strong><span style="font-size: 14pt;">3.7.</span></strong><strong><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></strong><strong><span style="font-size: 14pt;">&nbsp;<a name="TeubnerStreyModel"></a>Teubner Strey (Model)</span></strong></p>
 <p style="margin-left: 0.25in;">This function calculates the scattered intensity of a two-component system using the Teubner-Strey model.</p>
 <p style="margin-left: 0.25in;"><strong><span style="font-size: 14pt;">&nbsp;</span></strong></p>
Index: sansview/default_categories.p
===================================================================
--- sansview/default_categories.p	(revision 8e24480a562eb163c19e0618a6f5a150b8c229de)
+++ sansview/default_categories.p	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -211,69 +211,69 @@
 I01
 tp107
+a(S'MassSurfaceFractal'
+p108
+I01
+tp109
+a(S'Core2ndMomentModel'
+p110
+I01
+tp111
+a(S'RPA10Model'
+p112
+I01
+tp113
+a(S'TwoLorentzianModel'
+p114
+I01
+tp115
+a(S'DebyeModel'
+p116
+I01
+tp117
+a(S'MassFractalModel'
+p118
+I01
+tp119
 a(S'GuinierPorodModel'
-p108
-I01
-tp109
-a(S'MassSurfaceFractal'
-p110
-I01
-tp111
-a(S'Core2ndMomentModel'
-p112
-I01
-tp113
-a(S'RPA10Model'
-p114
-I01
-tp115
-a(S'TwoLorentzianModel'
-p116
-I01
-tp117
-a(S'DebyeModel'
-p118
-I01
-tp119
-a(S'MassFractalModel'
 p120
 I01
 tp121
+a(S'CorrLengthModel'
+p122
+I01
+tp123
+a(S'PolymerExclVolume'
+p124
+I01
+tp125
+a(S'FractalModel'
+p126
+I01
+tp127
+a(S'ReflectivityModel'
+p128
+I01
+tp129
+a(S'PeakLorentzModel'
+p130
+I01
+tp131
+a(S'BroadPeakModel'
+p132
+I01
+tp133
+a(S'ReflectivityIIModel'
+p134
+I01
+tp135
+a(S'PeakGaussModel'
+p136
+I01
+tp137
+a(S'FractalCoreShellModel'
+p138
+I01
+tp139
 a(S'Poly_GaussCoil'
-p122
-I01
-tp123
-a(S'CorrLengthModel'
-p124
-I01
-tp125
-a(S'PolymerExclVolume'
-p126
-I01
-tp127
-a(S'FractalModel'
-p128
-I01
-tp129
-a(S'ReflectivityModel'
-p130
-I01
-tp131
-a(S'PeakLorentzModel'
-p132
-I01
-tp133
-a(S'BroadPeakModel'
-p134
-I01
-tp135
-a(S'ReflectivityIIModel'
-p136
-I01
-tp137
-a(S'PeakGaussModel'
-p138
-I01
-tp139
-a(S'FractalCoreShellModel'
 p140
 I01
Index: sansview/local_config.py
===================================================================
--- sansview/local_config.py	(revision 9cd75d7942df87acdb53cb566ed284c11a0da6ec)
+++ sansview/local_config.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -12,6 +12,7 @@
 __version__ = sans.sansview.__version__
 __build__ = sans.sansview.__build__
-__download_page__ = 'https://sourceforge.net/projects/sansviewproject/files/'
-__update_URL__ = 'http://sansviewproject.svn.sourceforge.net/viewvc/sansviewproject/trunk/sansview.latestversion'
+__download_page__ = 'http://sourceforge.net/projects/sasview/files/'
+__update_URL__ = ['svn.code.sf.net', 
+                  '/p/sasview/code/trunk/sansview.latestversion']
 
 
@@ -35,9 +36,9 @@
 
 '''
-_homepage = "http://danse.chem.utk.edu"
-_download = "https://sourceforge.net/projects/sansviewproject/"
+_homepage = "http://www.sasview.org"
+_download = __download_page__
 _authors = []
-_paper = "http://sourceforge.net/apps/trac/sansviewproject/report"
-_license = "mailto:sansviewproject-developers@lists.sourceforge.net"
+_paper = "http://sourceforge.net/p/sasview/tickets/"
+_license = "mailto:help@sasview.org"
 
 
@@ -47,7 +48,10 @@
 test_path =  os.path.abspath(os.path.join(os.path.dirname(__file__), "test"))
 
-_nist_logo = "images/nist_logo.png"
-_umd_logo = "images/umd_logo.png"
-_sns_logo = "images/sns_logo.png"
+_nist_logo = os.path.join(icon_path, "nist_logo.png")
+_umd_logo = os.path.join(icon_path, "umd_logo.png")
+_sns_logo = os.path.join(icon_path, "sns_logo.png")
+_isis_logo = os.path.join(icon_path, "isis_logo.png")
+_ess_logo = os.path.join(icon_path, "ess_logo.png")
+_ill_logo = os.path.join(icon_path, "ill_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -57,4 +61,7 @@
 _sns_url = "http://neutrons.ornl.gov/"
 _nsf_url = "http://www.nsf.gov"
+_isis_url = "http://www.isis.stfc.ac.uk/"
+_ess_url = "http://ess-scandinavia.eu/"
+_ill_url = "http://www.ill.eu/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
Index: sansview/welcome_panel.py
===================================================================
--- sansview/welcome_panel.py	(revision 0b96d74d3a36690190f179324990adbac0063d8b)
+++ sansview/welcome_panel.py	(revision 657e52c6e801e630d2fc6f1722a752b701d20771)
@@ -95,5 +95,5 @@
                                                "Comments? Bugs? Requests?")
         send_ticket = "Send us a ticket at: "
-        send_ticket += "sansviewproject-developers@lists.sourceforge.net"
+        send_ticket += "help@sasview.org"
         self.hyperlink_paper = wx.lib.hyperlink.HyperLinkCtrl(self, -1,
             send_ticket, URL=config._license)
