diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 5dbdb4d1..60f07f50 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -23,6 +23,9 @@
     <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
     <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %>
     <%= javascript_tag "var TAG_NAME = '#{@tag_name}';" if @tag_name %>
+    <script type="text/javascript">
+      var contextNames = <%= context_names_for_autocomplete %>;
+    </script>
     <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />
     <%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => "RSS feed of next actions"}) %>
     <link rel="search" type="application/opensearchdescription+xml" title="Tracks" href="<%= search_plugin_path %>" />
diff --git a/app/views/shared/_add_new_item_form.rhtml b/app/views/shared/_add_new_item_form.rhtml
index 92122405..8a813eaa 100644
--- a/app/views/shared/_add_new_item_form.rhtml
+++ b/app/views/shared/_add_new_item_form.rhtml
@@ -15,9 +15,9 @@
     <% form_remote_tag(
       :url => todos_path, :method => :post,
       :html=> { :id=>'todo-form-new-action', :name=>'todo', :class => 'inline-form' },
-      :before => "$('todo_new_action_submit').startWaiting()",
-      :complete => "$('todo_new_action_submit').stopWaiting()",
-      :condition => "!$('todo_new_action_submit').isWaiting() && askIfNewContextProvided()") do -%>
+      :before => "$('todo_new_action_submit').block({message:null})",
+      :complete => "$('todo_new_action_submit').unblock()",
+      :condition => "askIfNewContextProvided()") do -%>
 
       <div id="status"><%= error_messages_for("item", :object_name => 'action') %></div>
 
@@ -40,10 +40,6 @@
       <label for="tag_list">Tags (separate with commas)</label>
       <%= text_field_tag "tag_list", nil, :size => 30, :tabindex => 5 %>
       <%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %>
-      <%= auto_complete_field 'tag_list', {
-        :url => {:controller => 'todos', :action => 'auto_complete_for_tag'},
-        :tokens => [',']
-      } %>
 
       <div class="due_input">
         <label for="todo_due">Due</label>
@@ -66,67 +62,5 @@
         </div>
       </div>
     <% end -%>
-
-    <script type="text/javascript" charset="utf-8">
-
-      var contextNames = <%= context_names_for_autocomplete %>;
-      var projectNames = <%= project_names_for_autocomplete %>;
-
-      function askIfNewContextProvided() {
-        var givenContextName = $('todo_context_name').value;
-        if (givenContextName.length == 0) return true; // do nothing and depend on rails validation error
-        for (var i = 0; i < contextNames.length; ++i) {
-          if (contextNames[i] == givenContextName) return true;
-        }
-        return confirm('New context "' + givenContextName + '" will be also created. Are you sure?');
-      }
-
-      var projectAutoCompleter = new Autocompleter.Local('todo_project_name', 'project_list', projectNames, {choices:100,autoSelect:false});
-
-      function selectDefaultContext() {
-        todoContextNameElement = $('todo_context_name');
-        defaultContextName = todoContextNameElement.projectDefaultContextsMap[this.value];
-        if (defaultContextName && !todoContextNameElement.editedByTracksUser) {
-          todoContextNameElement.value = defaultContextName;
-        }
-      }
-      function selectDefaultTags() {
-        todoTagListElement = $('tag_list');
-        defaultTags = todoTagListElement.projectDefaultTagsMap[this.value];
-        if (defaultTags && !todoTagListElement.editedByTracksUser) {
-          todoTagListElement.value = defaultTags;
-        }
-      }
-      Event.observe($('todo_project_name'), "focus", projectAutoCompleter.activate.bind(projectAutoCompleter));
-      Event.observe($('todo_project_name'), "click", projectAutoCompleter.activate.bind(projectAutoCompleter));
-      Event.observe($('todo_project_name'), "blur", selectDefaultContext.bind($('todo_project_name')));
-      Event.observe($('todo_project_name'), "blur", selectDefaultTags.bind($('todo_project_name')));
-
-      var contextAutoCompleter;
-      function initializeNamesForAutoComplete(contextNamesForAutoComplete) {
-        if (contextNamesForAutoComplete.length == 0 || contextNamesForAutoComplete[0].length == 0) {
-          return;
-        }
-        contextAutoCompleter = new Autocompleter.Local('todo_context_name', 'context_list', contextNamesForAutoComplete, {choices:100,autoSelect:false});
-        Event.observe($('todo_context_name'), "focus", function(){ $('todo_context_name').editedByTracksUser = true; });
-        Event.observe($('tag_list'), "focus", function(){ $('tag_list').editedByTracksUser = true; });
-        Event.observe($('todo_context_name'), "focus", contextAutoCompleter.activate.bind(contextAutoCompleter));
-        Event.observe($('todo_context_name'), "click", contextAutoCompleter.activate.bind(contextAutoCompleter));
-      }
-
-      function updateContextNamesForAutoComplete(contextNamesForAutoComplete) {
-        if (contextAutoCompleter) { // i.e. if we're already initialized
-          contextAutoCompleter.options.array = contextNamesForAutoComplete
-        } else {
-          initializeNamesForAutoComplete(contextNamesForAutoComplete)
-        }
-      }
-      initializeNamesForAutoComplete(contextNames);
-      $('todo_context_name').projectDefaultContextsMap = eval('(' + <%= @default_project_context_name_map %> + ')');
-      $('tag_list').projectDefaultTagsMap = eval('(' + <%= @default_project_tags_map %> + ')');
-    </script>
-
-    <%= calendar_setup( "todo_due"  ) %>
-    <%= calendar_setup( "todo_show_from"  ) %>
   </div>
 </div>
diff --git a/app/views/todos/create.js.rjs b/app/views/todos/create.js.rjs
index e7817d75..c746dda8 100644
--- a/app/views/todos/create.js.rjs
+++ b/app/views/todos/create.js.rjs
@@ -6,11 +6,11 @@ if @saved
   status_message = 'Added new context / ' + status_message if @new_context_created
   page.notify :notice, status_message, 5.0
   page['badge_count'].replace_html @down_count
-  page.send :record, "Form.reset('todo-form-new-action');Form.focusFirstElement('todo-form-new-action')"
+  page.send :record, "$('#todo-form-new-action').clearForm();$('#todo-form-new-action input:first').focus();"
   page['todo_context_name'].value = @initial_context_name
   page['todo_project_name'].value = @initial_project_name
-  page << "updateContextNamesForAutoComplete(#{context_names_for_autocomplete})" if @new_context_created
-  page << "projectAutoCompleter.options.array = #{project_names_for_autocomplete}" if @new_project_created
+  #page << "updateContextNamesForAutoComplete(#{context_names_for_autocomplete})" if @new_context_created
+  #page << "projectAutoCompleter.options.array = #{project_names_for_autocomplete}" if @new_project_created
   if should_show_new_item()
     if @new_context_created
       page.insert_html :top, 'display_box', :partial => 'contexts/context', :locals => { :context => @todo.context, :collapsible => true }
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9f96a4d0..c2e7a865 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -220,6 +220,15 @@ function setup_container_toggles(){
       });
 }
 
+function askIfNewContextProvided() {
+  var givenContextName = $('#todo_context_name').val();
+  if (givenContextName.length == 0) return true; // do nothing and depend on rails validation error
+  for (var i = 0; i < contextNames.length; ++i) {
+    if (contextNames[i] == givenContextName) return true;
+  }
+  return confirm('New context "' + givenContextName + '" will be also created. Are you sure?');
+}
+
 /* Unobtrusive jQuery behavior */
 
 $(document).ready(function() {