diff --git a/app/views/shared/_group_friends.haml b/app/views/shared/_group_friends.haml
index 206d588c12e28ed4b8975802bc6a7f4e1dd8c987..7ab5b6799634dc58607a5e39d0868e9f9ab135ef 100644
--- a/app/views/shared/_group_friends.haml
+++ b/app/views/shared/_group_friends.haml
@@ -4,6 +4,7 @@
 
   - unless @group == :all
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
+    = link_to "Edit", (edit_group_path(@group)), :class => "buttion"
   
     .yo{:style => 'display:none'}
       #add_request_pane
diff --git a/public/javascripts/group-edit.js b/public/javascripts/group-edit.js
index 9cc0c0f30f3d7ed33f648db373d89e2b34ef3ad3..63ff13a86a593cc05eeb60d23a30d26b664902a1 100644
--- a/public/javascripts/group-edit.js
+++ b/public/javascripts/group-edit.js
@@ -4,6 +4,8 @@ $('#move_friends_link').live( 'click',
         {'moves' : $('#group_list').data()},
         function(){ $('#group_title').html("Groups edited successfully!");});
       $(".person").css('background-color','white');
+      $('#group_list').removeData();
+      $(".person").setAttribute('from_group_id', function(){$(this).closest(".group ul").attr('id')})
     });
 
 $(function() {
@@ -13,7 +15,6 @@ $(function() {
 		$(".group ul").droppable({
 
 			drop: function(event, ui) {
-				//$("<li class='person ui-draggable'></li>").text(ui.draggable.text()).appendTo(this).draggable();
         var move = {};
         move[ 'friend_id' ] = ui.draggable[0].id
         move[ 'to' ] = $(this)[0].id;