diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index c4cb71344..e62362f76 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -26,7 +26,7 @@
     #aspect_name_edit.hidden
       = form_for @aspect, :remote => true do |aspect|
         = aspect.text_field :name
-        = aspect.submit t('.update'), :disable_with => 'updating', :class => 'button'
+        = aspect.submit t('.update'), :disable_with => t('.updating'), :class => 'button'
 
   - if @contacts.count > 0
     = render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc5d9c6d5..8e58642e4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -91,6 +91,7 @@ en:
       aspect_list_is_visible: "aspect list is visible to others in aspect"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       update: "update"
+      updating: "updating"
     aspect_contacts:
       done_editing: "done editing"
     aspect_stream:
diff --git a/db/migrate/20110319172136_add_likes.rb b/db/migrate/20110319172136_add_likes.rb
new file mode 100644
index 000000000..d4fcaa788
--- /dev/null
+++ b/db/migrate/20110319172136_add_likes.rb
@@ -0,0 +1,26 @@
+class AddLikes < ActiveRecord::Migration
+  def self.up
+    result = execute("SELECT version FROM schema_migrations WHERE version = '201110319172136'")
+    if result.count > 0
+      execute("DELETE FROM schema_migrations WHERE version = '201110319172136'")
+    else
+      create_table :likes do |t|
+        t.boolean :positive, :default => true
+        t.integer :post_id
+        t.integer :author_id
+        t.string :guid
+        t.text :author_signature
+        t.text :parent_author_signature
+        t.timestamps
+      end
+      add_index :likes, :guid, :unique => true
+      add_index :likes, :post_id
+      add_foreign_key(:likes, :posts, :dependant => :delete)
+      add_foreign_key(:likes, :people, :column =>  :author_id, :dependant => :delete)
+    end
+  end
+
+  def self.down
+    drop_table :likes
+  end
+end
diff --git a/db/migrate/201110319172136_add_likes.rb b/db/migrate/201110319172136_add_likes.rb
deleted file mode 100644
index 0cf481ae4..000000000
--- a/db/migrate/201110319172136_add_likes.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class AddLikes < ActiveRecord::Migration
-  def self.up
-    create_table :likes do |t|
-      t.boolean :positive, :default => true
-      t.integer :post_id
-      t.integer :author_id
-      t.string :guid
-      t.text :author_signature
-      t.text :parent_author_signature
-      t.timestamps
-    end
-    add_index :likes, :guid, :unique => true
-    add_index :likes, :post_id
-    add_foreign_key(:likes, :posts, :dependant => :delete)
-    add_foreign_key(:likes, :people, :column =>  :author_id, :dependant => :delete)
-  end
-
-  def self.down
-    drop_table :likes
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index ca201bb39..488540fe3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 201110319172136) do
+ActiveRecord::Schema.define(:version => 20110319172136) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false