diff --git a/tracks/app/controllers/application.rb b/tracks/app/controllers/application.rb
index 5c55696d..c07f3db7 100644
--- a/tracks/app/controllers/application.rb
+++ b/tracks/app/controllers/application.rb
@@ -182,7 +182,7 @@ class ApplicationController < ActionController::Base
   end
     
   def init_data_for_sidebar
-    @projects = @projects || current_user.projects
+    @projects = @projects || current_user.projects.find(:all, :include => [:default_context ])
     @contexts = @contexts || current_user.contexts
     init_not_done_counts
     if prefs.show_hidden_projects_in_sidebar
diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb
index a6d5658e..87654b0e 100644
--- a/tracks/app/controllers/todos_controller.rb
+++ b/tracks/app/controllers/todos_controller.rb
@@ -10,7 +10,7 @@ class TodosController < ApplicationController
   session :off, :only => :index, :if => Proc.new { |req| is_feed_request(req) }
 
   def index
-    @projects = current_user.projects.find(:all, :include => [ :todos ])
+    @projects = current_user.projects.find(:all, :include => [ :todos, :default_context ])
     @contexts = current_user.contexts.find(:all, :include => [ :todos ])
 
     @contexts_to_show = @contexts.reject {|x| x.hide? }    
@@ -258,7 +258,7 @@ class TodosController < ApplicationController
     @source_view = 'deferred'
     @page_title = "TRACKS::Tickler"
     
-    @projects = current_user.projects.find(:all, :include => [ :todos ])
+    @projects = current_user.projects.find(:all, :include => [ :todos, :default_context ])
     @contexts_to_show = @contexts = current_user.contexts.find(:all, :include => [ :todos ])
     
     current_user.deferred_todos.find_and_activate_ready
@@ -415,7 +415,6 @@ class TodosController < ApplicationController
 
             # Exclude hidden projects from the home page
             @not_done_todos = Todo.find(:all, :conditions => ['todos.user_id = ? and todos.state = ? AND contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', current_user.id, 'active', false, 'active'], :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", :include => [ :project, :context, :tags ])
-            
           end
 
         end
diff --git a/tracks/app/models/user.rb b/tracks/app/models/user.rb
index c7fc7a26..16b10f6e 100644
--- a/tracks/app/models/user.rb
+++ b/tracks/app/models/user.rb
@@ -12,7 +12,7 @@ class User < ActiveRecord::Base
              end
            end
   has_many :projects,
-           :order => 'position ASC',
+           :order => 'projects.position ASC',
            :dependent => :delete_all do
               def find_by_params(params)
                 find(params['id'] || params['project_id'])