diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index b6b3dc822..24c4634b8 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -34,7 +34,7 @@ class RequestsController < ApplicationController
     puts params.inspect
     rel_hash = relationship_flow(params[:request][:destination_url])
     Rails.logger.debug("Sending request: #{rel_hash}")
-    @request = current_user.send_request(rel_hash, params[:request][:group])
+    @request = current_user.send_request(rel_hash, params[:request][:group_id])
 
     if @request
       flash[:notice] = "a friend request was sent to #{@request.destination_url}"
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c93c474fc..133de0610 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,9 @@
 class UsersController < ApplicationController
   before_filter :authenticate_user!, :except => [:new, :create]
   def index
+
+    @group_array = current_user.groups.collect{|x| [x.to_s, x.id]} 
+
     unless params[:q]
       @people = Person.all
       render :index
diff --git a/app/models/group.rb b/app/models/group.rb
index 275bbf3a5..a01dcca5f 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -15,6 +15,9 @@ class Group
   belongs_to :user, :class_name => 'User'
 
   timestamps!
-
+  
+  def to_s
+    name
+  end
 end
 
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 42cd8b5e5..5dbe3b203 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -7,6 +7,6 @@
 
   Enter a Diaspora URL, Diaspora username, or random email address:  
   = f.text_field :destination_url
-  = f.hidden_field :group, :value => @group.id
+  = f.hidden_field :group_id, :value => @group.id
   = f.submit
 
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index 6975a8054..fec427aa4 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -1,19 +1,26 @@
-= @people.count.to_s + search_or_index
+= (@people.count-1).to_s + search_or_index
 %table
   %tr
     %th real name
     %th email
     %th url
   - for person in @people
-    %tr
-      %td= person.real_name
-      %td= person.email
-      %td= person.url
-      %td
-        %select{ :class => "group_selector", :style=>"display:inline;"}
-          %option Add to group
-          %option
-          - for group in current_user.groups
-            %option{:value => group.id}= group.name
-      
-      %td= link_to "add as friend", requests_path(:request => {:destination_url => person.email}), :class => "submit", :method => "post"
\ No newline at end of file
+    - unless person.id == current_user.person.id
+      %tr
+        %td= person.real_name
+        %td= person.email
+        %td= person.url
+        
+        -if current_user.friends.include? person
+        -elsif current_user.pending_requests.find_by_person_id(person.id)
+          %td 
+          %td ^-you have a friend request from this person       
+        -elsif current_user.pending_requests.find_by_url(person.receive_url)
+          %td 
+          %td friend request pending
+        -else
+          %td
+            = form_for Request.new do |f|
+              =f.select(:group_id, @groups_array)
+              = f.hidden_field :destination_url, :value => person.email
+              =f.submit