--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -101,14 +101,19 @@ class ArticlesController < ApplicationController
   
   # Show all articles for a project
   def find_by_project
-    @articles = Article.find_by_project(@project.id, current_user)
-    if @articles.size > 0 then
-      @title = @project.title << " Articles"
-      @show_archive_breadcrumb = true
-      render :action => "ac_index"      
+    if @project
+      @articles = Article.find_by_project(@project.id, current_user)
+      if @articles.size > 0
+        @title = @project.title << " Articles"
+        @show_archive_breadcrumb = true
+        render :action => "ac_index"      
+      else
+        flash[:error] = "No articles found for project '" << @project.title << "'."
+        redirect_to project_path(@project)
+      end
     else
-      flash[:error] = "No articles found for project '" << @project.title << "'."
-      redirect_to project_path(@project)
+        flash[:error] = "Project not found."
+        redirect_to root_path
     end
   end
   

--- a/app/helpers/articles_helper.rb
+++ b/app/helpers/articles_helper.rb
@@ -153,7 +153,7 @@ module ArticlesHelper
       out << %Q{#{link_to("Other", article_sitename_path)}}
     else
       #FIXME had to frig this until project routes merged
-      out << %Q{#{link_to(p, "/projects/" << u, :class => "blacklink")}}
+      out << %Q{#{link_to(p, "/archives/project/" << u, :class => "blacklink")}}
     end
     out << %Q{</th>}
     # numeric td

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -37,6 +37,21 @@ module ProjectsHelper
     end
     out
   end
+    
+  def render_right_popular_projects
+    out = ""
+    projects = Project.find_popular_projects(current_user)
+    if projects.size > 0
+      out << "<table class='right_default_table'>"
+      out << "<tr><th>Popular Projects</th></tr>"
+      for project in projects
+        #TODO only display admin/modify members
+        out << %Q{<tr><td>#{link_to(project.title, project_path(project))} </span></small></td></tr>}
+      end
+      out << "</table>"
+    end
+    out
+  end
 
   def project_tab (active_tab, tab)
     title, suffix = Project.tab_settings(tab)
@@ -133,7 +148,6 @@ module ProjectsHelper
     end
     out
   end
-
   
   def render_project_roadmap
     #get all milestones for a project
@@ -162,8 +176,6 @@ module ProjectsHelper
     out
   end
   
-  
-  
   def format_life_cycle (ls)
     case ls
     when :pre_alpha

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -175,6 +175,11 @@ class Project < ActiveRecord::Base
       find(:all, :conditions => ["status = '#{:active}' AND ( audience = '#{:public}' OR id IN (" << projects_allowed << ") )"])
     end
 
+    def self.find_popular_projects (curruser)
+      projects_allowed = Project.list_for_user(curruser)
+      find(:all, :conditions => ["status = '#{:active}' AND ( audience = '#{:public}' OR id IN (" << projects_allowed << ") )"], :limit => 10, :order => "views DESC")
+    end
+    
     # returns all public projects (no private regardless of allowed)
     def self.find_all_active_public_projects (curruser)
       projects_allowed = Project.list_for_user(curruser)

--- a/app/views/site/ac_index.html.erb
+++ b/app/views/site/ac_index.html.erb
@@ -6,6 +6,7 @@
 
 <%= div_rightcolumn_open %>
 <%= actionbox_basic %>
+<%= render_right_popular_projects  %>
 <%= render_right_article_project_grid %>
 <%= div_rightcolumn_close %>
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -79,7 +79,7 @@ ActionController::Routing::Routes.draw do |map|
   #FIXME this can probably be converted in to a map.resources :archives, has_many => [categories, types, projects]
   map.article_category 'archives/category/:category', :controller => 'articles', :action => 'find_by_category'
   map.article_type 'archives/type/:article_type', :controller => 'articles', :action => 'find_by_type'
-  map.article_project 'archives/project/:project_slug', :controller => 'articles', :action => 'find_by_project'
+  map.article_project 'archives/project/:project_id', :controller => 'articles', :action => 'find_by_project'
   map.article_user 'archives/user/:user_slug', :controller => 'articles', :action => 'find_by_user'
   #although it could more issues with the security stuff
   #FIXME these need changing now

--- a/test/fixtures/wiki_pages/_gitlab_credits.txt
+++ b/test/fixtures/wiki_pages/_gitlab_credits.txt
@@ -1,5 +1,5 @@
 Biggest credit is to Johan Sørensen of [Gitorious](http://www.gitorious.org), which
-this project is a fork of and Tom Preston-Werner who developed [Grit](http://grit.rubyforge.org) (the underlying interface to [Git](http://git.or.cz)).
+this project is a fork of and Tom Preston-Werner who developed [Grit](http://grit.rubyforge.org) (the interface to [Git](http://git.or.cz)).
 
 The credit list includes sources of code either directly used in the project, or read to help figure something out: