--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -86,6 +86,7 @@
     @expose('jinja:allura:templates/neighborhood_project_list.html')
     @with_trailing_slash
     def index(self, sort='alpha', limit=25, page=0, **kw):
+        c.project = self.neighborhood.neighborhood_project
         if self.neighborhood.redirect:
             redirect(self.neighborhood.redirect)
         c.project_summary = W.project_summary
@@ -123,6 +124,7 @@
     @expose('jinja:allura:templates/neighborhood_add_project.html')
     @without_trailing_slash
     def add_project(self, **form_data):
+        c.project = self.neighborhood.neighborhood_project
         require_access(self.neighborhood, 'register')
         c.add_project = W.add_project
         form_data['tools'] = ['Wiki','Git','Tickets','Downloads','Discussion']
@@ -172,7 +174,7 @@
         if tools and not neighborhood.project_template:
             for i, tool in enumerate(tools):
                 c.project.install_app(tool, ordinal=i+offset)
-        flash('Welcome to the SourceForge Beta System! '
+        flash('Welcome to the SourceForge Project System! '
               'To get started, fill out some information about your project.')
         redirect(c.project.script_name + 'admin/overview')
 
@@ -192,6 +194,7 @@
 
     @expose()
     def _lookup(self, category_name, *remainder):
+        c.project = self.neighborhood.neighborhood_project
         category_name=unquote(category_name)
         return NeighborhoodProjectBrowseController(neighborhood=self.neighborhood, category_name=category_name, parent_category=self.category), remainder
 
@@ -464,7 +467,7 @@
         self.neighborhood.css = css
         self.neighborhood.project_template = project_template
         self.neighborhood.allow_browse = kw.get('allow_browse', False)
-        if self.neighborhood.should_show_icon() and icon is not None and icon != '':
+        if self.neighborhood.should_show_icon and icon is not None and icon != '':
             if self.neighborhood.icon:
                 self.neighborhood.icon.delete()
             M.NeighborhoodFile.save_image(
@@ -484,6 +487,7 @@
 
     @expose('jinja:allura:templates/neighborhood_moderate.html')
     def index(self, **kw):
+        c.project = self.neighborhood.neighborhood_project
         other_nbhds = list(M.Neighborhood.query.find(dict(_id={'$ne':self.neighborhood._id})).sort('name'))
         return dict(neighborhood=self.neighborhood,
                     neighborhoods=other_nbhds)