diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb
index be659b3a..2bfcdc3b 100644
--- a/app/controllers/recurring_todos_controller.rb
+++ b/app/controllers/recurring_todos_controller.rb
@@ -2,7 +2,7 @@ class RecurringTodosController < ApplicationController
 
   helper :todos, :recurring_todos
 
-  append_before_filter :init, :only => [:index, :new, :edit]
+  append_before_filter :init, :only => [:index, :new, :edit, :create]
   append_before_filter :get_recurring_todo_from_param, :only => [:destroy, :toggle_check, :toggle_star, :edit, :update]
 
   def index
@@ -243,7 +243,7 @@ class RecurringTodosController < ApplicationController
 
   private
   
-  def init 
+  def init
     @days_of_week = [ ['Sunday',0], ['Monday',1], ['Tuesday', 2], ['Wednesday',3], ['Thursday',4], ['Friday',5], ['Saturday',6]]
     @months_of_year = [ 
       ['January',1], ['Februari',2], ['March', 3], ['April',4], ['May',5], ['June',6], 
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index d8fe0a51..8eafc567 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -24,14 +24,12 @@ module TodosHelper
       :class => "icon star_item", :title => "star the action '#{@todo.description}'")
   end
 
-  def remote_edit_menu_item(parameters, todo)
-    return link_to_remote(
-      image_tag("edit_off.png", :mouseover => "edit_on.png", :alt => "Edit", :align => "absmiddle", :id => 'edit_icon_todo_'+todo.id.to_s)+" Edit",
-      :url => {:controller => 'todos', :action => 'edit', :id => todo.id},
-      :method => 'get',
-      :with => "'#{parameters}'",
-      :before => todo_start_waiting_js(todo),
-      :complete => todo_stop_waiting_js(todo))
+  def remote_edit_button
+    link_to(
+      image_tag("blank.png", :alt => "Edit", :align => "absmiddle", :id => 'edit_icon_todo_'+@todo.id.to_s, :class => 'edit_item'),
+      {:controller => 'todos', :action => 'edit', :id => @todo.id},
+      :class => "icon edit_item",
+      :title => "Edit the action '#{@todo.description}'")
   end
 
   def remote_delete_menu_item(parameters, todo)
@@ -121,8 +119,10 @@ module TodosHelper
   def grip_span
     unless @todo.completed?
       image_tag('grip.png', :width => '7', :height => '16', :border => '0', 
-        :title => 'Drag onto another action to make it depend on that action',
-        :class => 'grip')
+                :title => 'Drag onto another action to make it depend on that action',
+                :class => 'grip') +
+      image_tag('blank.png', :width => 16, :height => 16, :border => 0,
+                :title => "Drop an action to make it depend on this action", :class => 'successor_target')
     end
   end
   
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 11ebb9d8..223efb41 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -30,6 +30,7 @@
       var defaultTags = <%= default_tags_for_autocomplete %>;
       var tagNames = <%= tag_names_for_autocomplete %>;
       var dateFormat = '<%= date_format_for_date_picker %>';
+      var weekStart = '<%= current_user.prefs.week_starts %>';
       <% end -%>
       <% if @prefs.refresh != 0 -%>
         setup_auto_refresh(<%= @prefs["refresh"].to_i*60000 %>);
diff --git a/app/views/recurring_todos/_recurring_todo_form.erb b/app/views/recurring_todos/_recurring_todo_form.erb
index ef724f33..4b3dc734 100644
--- a/app/views/recurring_todos/_recurring_todo_form.erb
+++ b/app/views/recurring_todos/_recurring_todo_form.erb
@@ -2,8 +2,7 @@
   <% form_remote_tag(
     :url => recurring_todos_path, :method => :post,
     :html=> { :id=>'recurring-todo-form-new-action', :name=>'recurring_todo', :class => 'inline-form' },
-    :before => "$('#recurring_todo_new_action_submit').block({message: null})",
-    :complete => "$('#recurring_todo_new_action_submit').unblock();$('#recurring-todo-form-new-action').clearForm();") do 
+    :before => "$('#recurring_todo_new_action_submit').block({message: null})") do
     -%>
     <div id="new_status"><%= error_messages_for("item", :object_name => 'action') %></div>
   
@@ -18,7 +17,7 @@
         <div class="page_name_auto_complete" id="project_list" style="display:none"></div>
       
         <label for="recurring_todo_context_name">Context</label>
-        <input id="recurring_todo_context_name" name="context_name" autocomplete="off" tabindex="4" size="30" type="text" value="" />
+        <input id="recurring_todo_context_name" name="context_name" autocomplete="off" tabindex="4" size="30" type="text" value="<%= current_user.contexts.first.name unless current_user.contexts.first.nil?%>" />
         <div class="page_name_auto_complete" id="context_list" style="display:none"></div>  
         <label for="tag_list">Tags (separate with commas)</label>
         <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => 5 -%> 
diff --git a/app/views/recurring_todos/create.js.rjs b/app/views/recurring_todos/create.js.rjs
index 790e2fc9..4ef13703 100644
--- a/app/views/recurring_todos/create.js.rjs
+++ b/app/views/recurring_todos/create.js.rjs
@@ -4,8 +4,7 @@ page.replace_html 'new_status', "#{error_messages_for('recurring_todo')}"
 page.notify :notice, @message, 5.0
 if @recurring_saved
   # reset form
-  page << "TracksForm.hide_all_recurring(); $('#recurring_daily').show();"
-  page << "$('#recurring_todo_new_action_submit').unblock();$('#recurring-todo-form-new-action').clearForm();"
+  page['new-recurring-todo'].replace_html :partial => 'recurring_todo_form'
   # hide overlayed edit form
   page << "TracksForm.toggle_overlay();"
   # insert new recurring todo
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 579ea766..4e325c8b 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -11,12 +11,12 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
   <div id="<%= dom_id(todo, 'line') %>" class="item-show">
     <%= remote_star_icon %>
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
+    <% unless suppress_edit_button %>
+      <%= remote_edit_button %>
+    <% end %>
     <ul class="sf-menu sf-item-menu">
       <li style="z-index:<%=@z_index_counter%>"><%= image_tag "downarrow.png", :alt=> "" %>
         <ul id="ul<%= dom_id(todo) %>">
-          <% unless suppress_edit_button %>
-            <li><%= remote_edit_menu_item(parameters, todo) %></li>
-          <% end %>
           <li><%= remote_delete_menu_item(parameters, todo) %></li>
           <% unless todo.completed? || todo.deferred? %>
             <li><%= remote_defer_menu_item(1, todo) %></li>
diff --git a/app/views/todos/add_predecessor.js.rjs b/app/views/todos/add_predecessor.js.rjs
index dfe73a7d..ee5715a4 100644
--- a/app/views/todos/add_predecessor.js.rjs
+++ b/app/views/todos/add_predecessor.js.rjs
@@ -9,6 +9,13 @@ if @saved
   # regenerate predecessor to add arrow
   page[@predecessor].replace_html :partial => 'todos/todo', :locals => { :todo => @predecessor, :parent_container_type => parent_container_type }
 
+  # regenerate predecessors of predecessor
+  parents = @predecessor.predecessors
+  parents.each do |parent|
+    puts parent.description
+    page[parent].replace_html :partial => 'todos/todo', :locals => { :todo => parent, :parent_container_type => parent_container_type }
+  end
+
   # show in tickler box in project view
   if source_view_is_one_of :project, :tag
     page['tickler-empty-nd'].hide
diff --git a/app/views/todos/remove_predecessor.js.rjs b/app/views/todos/remove_predecessor.js.rjs
index 734d24a6..944a829b 100644
--- a/app/views/todos/remove_predecessor.js.rjs
+++ b/app/views/todos/remove_predecessor.js.rjs
@@ -5,6 +5,13 @@ if @removed
   # replace old predecessor with one without the successor
   page.replace dom_id(@predecessor), :partial => 'todos/todo', :locals => { 
     :todo => @predecessor, :parent_container_type => parent_container_type }
+
+  # regenerate predecessors of predecessor
+  parents = @predecessor.predecessors
+  parents.each do |parent|
+    puts parent.description
+    page[parent].replace_html :partial => 'todos/todo', :locals => { :todo => parent, :parent_container_type => parent_container_type }
+  end
  
   # update display if pending->active
   if @successor.active?
diff --git a/artwork/add_successor_on.svg b/artwork/add_successor_on.svg
new file mode 100644
index 00000000..b7b3165c
--- /dev/null
+++ b/artwork/add_successor_on.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="predecessor.svg"
+   inkscape:export-filename="/Users/epall/code/tracks/public/images/add_successor_on.png"
+   inkscape:export-xdpi="9.6245861"
+   inkscape:export-ydpi="9.6245861">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5258">
+      <stop
+         style="stop-color:#28343c;stop-opacity:1;"
+         offset="0"
+         id="stop5260" />
+      <stop
+         style="stop-color:#0096ff;stop-opacity:1;"
+         offset="1"
+         id="stop5262" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="TriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         id="path3768"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path3771"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3649"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3631"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path3765"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8)" />
+    </marker>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect2826"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect2822"
+       is_visible="true" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="29.11825 : 616.44767 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5258"
+       id="linearGradient5264"
+       x1="142.18495"
+       y1="261.65085"
+       x2="142.54144"
+       y2="174.1613"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter5282">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.63631671"
+         id="feGaussianBlur5284" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3579107"
+     inkscape:cx="109.12131"
+     inkscape:cy="846.66442"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5238"
+     showgrid="false"
+     inkscape:window-width="675"
+     inkscape:window-height="547"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g5238"
+       transform="translate(-23.335007,-4.8042662)"
+       style="fill:none;stroke:#ff0000;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         id="path5244"
+         style="fill:url(#linearGradient5264);fill-opacity:1;stroke:#3a3a3a;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;filter:url(#filter5282)"
+         d="m 124.05478,198.95569 25.59428,-0.003 -38.08971,39.75365 -36.022918,-39.75365 23.518346,0.003 0,-11.2623 c 0,-11.56985 3.814362,-23.72799 12.843752,-32.8125 9.02939,-9.08451 22.71756,-14.28125 39.34375,-14.28125 15.89659,0 28.81237,4.90636 36.875,13.9375 8.06263,9.03114 10.40625,20.50418 10.40625,30.9375 l 0,97.6875 -25,0 0,-97.6875 c 0,-6.68688 -1.49995,-11.41088 -4.0625,-14.28125 -2.56255,-2.87037 -7.00817,-5.59375 -18.21875,-5.59375 -11.69655,0 -17.86524,3.15497 -21.59375,6.90625 -3.72851,3.75128 -5.59375,8.92322 -5.59375,15.1875 l 0,11.2623 z"
+         sodipodi:nodetypes="ccccccscsccccssscc"
+         transform="matrix(-1,0,0,1,274.05996,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/artwork/predecessor.svg b/artwork/predecessor.svg
new file mode 100644
index 00000000..75e1ea1a
--- /dev/null
+++ b/artwork/predecessor.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="predecessor.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5258">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5260" />
+      <stop
+         style="stop-color:#ececec;stop-opacity:1;"
+         offset="1"
+         id="stop5262" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="TriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         id="path3768"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path3771"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3649"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3631"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path3765"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8)" />
+    </marker>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect2826"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect2822"
+       is_visible="true" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="29.11825 : 616.44767 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5258"
+       id="linearGradient5264"
+       x1="142.54144"
+       y1="285.28931"
+       x2="142.54144"
+       y2="174.1613"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter5282">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.63631671"
+         id="feGaussianBlur5284" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.51319034"
+     inkscape:cx="156.62969"
+     inkscape:cy="949.8091"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5238"
+     showgrid="false"
+     inkscape:window-width="675"
+     inkscape:window-height="547"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g5238"
+       transform="translate(-23.335007,-4.8042662)"
+       style="fill:none;stroke:#ff0000;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         id="path5244"
+         style="fill:url(#linearGradient5264);stroke:#3a3a3a;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;marker-start:none;stroke-opacity:1;fill-opacity:1;filter:url(#filter5282)"
+         d="m 124.05478,198.95569 25.59428,-0.003 -38.08971,39.75365 -36.022918,-39.75365 23.518346,0.003 0,-11.2623 c 0,-11.56985 3.814362,-23.72799 12.843752,-32.8125 9.02939,-9.08451 22.71756,-14.28125 39.34375,-14.28125 15.89659,0 28.81237,4.90636 36.875,13.9375 8.06263,9.03114 10.40625,20.50418 10.40625,30.9375 l 0,97.6875 -25,0 0,-97.6875 c 0,-6.68688 -1.49995,-11.41088 -4.0625,-14.28125 -2.56255,-2.87037 -7.00817,-5.59375 -18.21875,-5.59375 -11.69655,0 -17.86524,3.15497 -21.59375,6.90625 -3.72851,3.75128 -5.59375,8.92322 -5.59375,15.1875 l 0,11.2623 z"
+         sodipodi:nodetypes="ccccccscsccccssscc" />
+    </g>
+  </g>
+</svg>
diff --git a/public/images/add_successor_off.png b/public/images/add_successor_off.png
new file mode 100644
index 00000000..183f1326
Binary files /dev/null and b/public/images/add_successor_off.png differ
diff --git a/public/images/add_successor_on.png b/public/images/add_successor_on.png
new file mode 100644
index 00000000..d9e6eff9
Binary files /dev/null and b/public/images/add_successor_on.png differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index ca39f728..efacc608 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -185,7 +185,7 @@ function project_defaults(){
 }
 
 function enable_rich_interaction(){
-  $('input.Date').datepicker({'dateFormat': dateFormat});
+  $('input.Date').datepicker({'dateFormat': dateFormat, 'firstDay': weekStart});
   /* Autocomplete */
   $('input[name=context_name]').autocomplete(contextNames, {matchContains: true});
   $('input[name=project[default_context_name]]').autocomplete(contextNames, {matchContains: true});
@@ -209,7 +209,7 @@ function enable_rich_interaction(){
   /* Drag & Drop for successor/predecessor */
   function drop_todo(evt, ui) {
     dragged_todo = ui.draggable[0].id.split('_')[2];
-    dropped_todo = this.id.split('_')[2];
+    dropped_todo = $(this).parents('.item-show').get(0).id.split('_')[2];
     ui.draggable.hide();
     $(this).block({message: null});
     $.post('/todos/add_predecessor',
@@ -217,11 +217,14 @@ function enable_rich_interaction(){
         null, 'script');
   }
 
-  $('.item-show').draggable({handle: '.grip', revert: 'invalid'});
-  $('.item-show').droppable({
-        drop: drop_todo,
-        hoverClass: 'hover'
-      });
+  $('.item-show').draggable({handle: '.grip',
+      revert: 'invalid',
+      start: function() {$('.successor_target').show();},
+      stop: function() {$('.successor_target').hide();}});
+
+  $('.successor_target').droppable({drop: drop_todo,
+      tolerance: 'pointer',
+      hoverClass: 'hover'});
 
   /* Reset auto updater */
   field_touched = false;
@@ -307,6 +310,17 @@ $(document).ready(function() {
     $.post(this.value, params, null, 'script');
   });
 
+  /* set behavior for edit icon */
+  $(".item-container a.edit_item").live('click', function (ev){
+    itemContainer = $(this).parents(".item-container");
+    $.ajax({
+            url: this.href,
+            beforeSend: function() { itemContainer.block({message: null});},
+            complete: function() { itemContainer.unblock();},
+            dataType: 'script'});
+    return false;
+  });
+
   setup_container_toggles();
 
   $('#toggle_action_new').click(function(){
@@ -359,7 +373,6 @@ $(document).ready(function() {
     });
 
   $("#recurring_todo_new_action_cancel").click(function(){
-      $('#recurring-todo-form-new-action').clearForm();
       $('#recurring-todo-form-new-action input:text:first').focus();
       TracksForm.hide_all_recurring();
       $('#recurring_daily').show();
@@ -367,7 +380,6 @@ $(document).ready(function() {
   });
 
   $("#recurring_todo_edit_action_cancel").live('click', function(){
-      $('#recurring-todo-form-edit-action').clearForm();
       $('#recurring-todo-form-edit-action input:text:first').focus();
       TracksForm.hide_all_recurring();
       $('#recurring_daily').show();
diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css
index c32a167a..58148f63 100644
--- a/public/stylesheets/standard.css
+++ b/public/stylesheets/standard.css
@@ -939,9 +939,17 @@ div.message {
     cursor: move;
 }
 
-.hover {
-    background: #EAEAEA;
-    font-weight: bold;
+.successor_target {
+  background-image:url("../images/add_successor_off.png");
+  background-repeat: no-repeat;
+  background-position: center right;
+  display: none;
+}
+
+.successor_target.hover {
+  background-image:url("../images/add_successor_on.png");
+  background-repeat: no-repeat;
+  background-position: center right;
 }
 
 /* Error message styles */