diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 137fea38d..71c41ef6a 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -21,7 +21,13 @@
   - for friend in @friends
     = person_image_link(friend)
 
-  - unless @aspect == :all
+  -unless @aspect == :all
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
   
+    .yo{:style => 'display:none'}
+      #add_request_pane
+        = render "requests/new_request", :aspect => @aspect 
+  -else
+    .clear
+      = link_to "add friends", aspects_manage_path 
 
diff --git a/spec/fixtures/evan_hcard b/spec/fixtures/evan_hcard
new file mode 100644
index 000000000..d34408759
--- /dev/null
+++ b/spec/fixtures/evan_hcard
@@ -0,0 +1,72 @@
+   <body id="hcard">
+
+  <div id="wrap">
+   <div id="core">
+    <dl id="site_nav_local_views">
+     <dt>Local views</dt>
+     <dd></dd>
+</dl>
+    <div id="content">
+     <h1>Evan Prodromou</h1>
+
+     <div id="content_inner">
+      <div id="i" class="entity_profile vcard author">
+       <h2>User profile</h2>
+       <dl class="entity_depiction">
+        <dt>Photo</dt>
+        <dd>
+         <img src="http://avatar.status.net/evan/1-96-20100726204409.jpeg" class="photo avatar" width="96" height="96" alt="evan"/>
+</dd>
+
+</dl>
+       <dl class="entity_nickname">
+        <dt>Nickname</dt>
+        <dd>
+         <a href="http://evan.status.net/" rel="me" class="nickname url uid">evan</a>
+</dd>
+</dl>
+       <dl class="entity_fn">
+        <dt>Full name</dt>
+
+        <dd>
+         <span class="fn">Evan Prodromou</span>
+</dd>
+</dl>
+       <dl class="entity_location">
+        <dt>Location</dt>
+        <dd class="label">Montreal, QC, Canada</dd>
+</dl>
+       <dl class="entity_url">
+
+        <dt>URL</dt>
+        <dd>
+         <a href="http://evan.prodromou.name/" rel="me" class="url">http://evan.prodromou.name/</a>
+</dd>
+</dl>
+       <dl class="entity_note">
+        <dt>Note</dt>
+        <dd class="note">Montreal hacker and entrepreneur. Founder of identi.ca, lead developer of StatusNet, CEO of StatusNet Inc.</dd>
+
+</dl>
+</div>
+</div>
+</div>
+</div>
+   <div id="footer">
+    <dl id="licenses">
+     <dt id="site_statusnet_license">StatusNet software license</dt>
+     <dd><p><strong>Evan Prodromou</strong> is a microblogging service brought to you by <a href="http://status.net/">Status.net</a>. It runs the <a href="http://status.net/">StatusNet</a> microblogging software, version 0.9.5, available under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">GNU Affero General Public License</a>.</p>
+
+</dd>
+     <dt id="site_content_license">Site content license</dt>
+     <dd id="site_content_license_cc">
+      <p>
+       <img id="license_cc" src="http://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative Commons Attribution 3.0" width="80" height="15"/>:w
+       
+ All Evan Prodromou content and data are available under the <a class="license" rel="external license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.</p>
+</dd>
+
+</dl>
+</div>
+</div>
+</body>
diff --git a/spec/fixtures/finger_xrd b/spec/fixtures/finger_xrd
new file mode 100644
index 000000000..d897925e5
--- /dev/null
+++ b/spec/fixtures/finger_xrd
@@ -0,0 +1,9 @@
+    <?xml version='1.0'?>
+    <XRD>
+    <Subject>acct:tom@tom.joindiaspora.com</Subject>
+    <Alias>"http://tom.joindiaspora.com/"</Alias>
+    <Link rel="http://microformats.org/profile/hcard" type="text/html" href="http://tom.joindiaspora.com/hcard/users/4c8eccce34b7da59ff000002"/>
+    <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="http://tom.joindiaspora.com/"/>
+    <Link rel="http://joindiaspora.com/guid" type="text/html" href="4c8eccce34b7da59ff000002"/>
+    <Link rel="diaspora-public-key" type="RSA" href="LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUNDZ0tDQWdFQXlt dHpUdWQ3SytXQklPVVYwMmxZN2Z1NjdnNWQrbTBra1ZIQlgzTk1uYXB5bnZL a0VSemoKbkxma2JrTVpEVGdPNG1UaThmWFI3Q1ZSK3Q1SFN4b2Vub0JWazVX eUFabkEzWmpTRjBPcC9RakhlYzhvK0dVSApDOFluNFJ5N01hQ0R1cUNpNnJv c2RlbUlLTm1Fa2dsVVY1VzZ4WFd4Vmtrb21oL2VCQ2FmaVdMTXFRMG82NGox Ckw3aXNjQjVOM3ZkbnBrUmU3SkFxLzNDUTI3dWhDS0ZIWG1JYm1iVmhJQTNC R0J6YStPV3NjK1Z5cjV0Mm1wSlIKU1RXMk9UL20rS0NPK21kdnpmenQ0TzEr UHc1M1pJMjRpMlc2cW1XdThFZ1Z6QVcyMStuRGJManZiNHpzVHlrNQppN1JM cG8rUFl2VUJlLy8wM1lkQUJoRlJhVXpTL0RtcWRubEVvb0VvK0VmYzRkQ1NF bWVkMUgrek01c2xqQm1rCks5amsvOHNQZDB0SVZmMWZXdW9BcWZTSmErSXdr OHNybkdZbEVlaFV1dVhIY0x2b2JlUXJKYWdiRGc1Qll5TnIKeTAzcHpKTHlS ZU9UcC9RK1p0TXpMOFJMZWJsUzlWYXdNQzNDVzc5K0RGditTWGZ0eTl3NC8w d2NpUHpKejg2bgp2VzJ5K3crTThOWG52enBWNU81dGI4azZxZ2N0WjBmRzFu eXQ0RklsSHNVaUVoNnZLZmNLSmFPeWFRSGNGcWVxCjkwUkpoMm9TMDJBdFJx TFRSWDJJQjFnYXZnWEFXN1NYanJNbUNlVzlCdVBKYU5nZkp3WFFaelVoa0tC V1k0VnMKZTRFVWRob3R5RWkvUmE0RXVZU01ZcnZEeUFRUHJsY0wveDliaU1p bHVPcU9OMEpJZ1VodEZQRUNBd0VBQVE9PQotLS0tLUVORCBSU0EgUFVCTElD IEtFWS0tLS0tCg== "/>
+    </XRD>
diff --git a/spec/fixtures/hcard_response b/spec/fixtures/hcard_response
new file mode 100644
index 000000000..d87957a93
--- /dev/null
+++ b/spec/fixtures/hcard_response
@@ -0,0 +1,44 @@
+<div id="content"> 
+  <h1>Alexander Hamiltom</h1> 
+  <div id="content_inner"> 
+    <div id="i" class="entity_profile vcard author"> 
+      <h2>User profile</h2> 
+      <dl class="entity_nickname"> 
+        <dt>Nickname</dt> 
+        <dd> 
+        <a href="http://tom.joindiaspora.com/" rel="me" class="nickname url uid">Alexander Hamiltom</a> 
+        </dd> 
+      </dl> 
+        <dl class="entity_given_name"> 
+        <dt>Full name</dt> 
+        <dd> 
+        <span class="given_name" >Alexander</span> 
+        </dd> 
+        </dl>
+
+        <dl class="entity_family_name"> 
+        <dt>Full name</dt> 
+        <dd> 
+        <span class="family_name" >Hamiltom</span> 
+        </dd> 
+        </dl>
+        <dl class="entity_fn"> 
+        <dt>Full name</dt> 
+        <dd> 
+        <span class="fn" >Alexander Hamiltom</span> 
+        </dd> 
+      </dl> 
+      <dl class="entity_url"> 
+        <dt>URL</dt> 
+        <dd> 
+        <a href="http://tom.joindiaspora.com/" rel="me" id="pod_location" class="url">http://tom.joindiaspora.com/</a> 
+        </dd> 
+      </dl> 
+      <dl class="entity_note"> 
+        <dt>Note</dt> 
+        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd> 
+      </dl> 
+    </div> 
+  </div> 
+
+</div> 
diff --git a/spec/fixtures/host_xrd b/spec/fixtures/host_xrd
new file mode 100644
index 000000000..dcb67d767
--- /dev/null
+++ b/spec/fixtures/host_xrd
@@ -0,0 +1,7 @@
+  <?xml version='1.0' encoding='UTF-8'?>
+  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
+    <Link rel='lrdd' 
+          template='http://example.com/webfinger/?q={uri}'>
+      <Title>Resource Descriptor</Title>
+    </Link>
+  </XRD>
diff --git a/spec/fixtures/nonseed_finger_xrd b/spec/fixtures/nonseed_finger_xrd
new file mode 100644
index 000000000..b26e7d15d
--- /dev/null
+++ b/spec/fixtures/nonseed_finger_xrd
@@ -0,0 +1,15 @@
+      <XRD>
+      <Subject>acct:evan@status.net</Subject>
+      <Alias>acct:evan@evan.status.net</Alias>
+      <Alias>http://evan.status.net/user/1</Alias>
+      <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="http://evan.status.net/user/1"/>
+      <Link rel="http://schemas.google.com/g/2010#updates-from" href="http://evan.status.net/api/statuses/user_timeline/1.atom" type="application/atom+xml"/>
+      <Link rel="http://microformats.org/profile/hcard" type="text/html" href="http://evan.status.net/hcard"/>
+      <Link rel="http://gmpg.org/xfn/11" type="text/html" href="http://evan.status.net/user/1"/>
+      <Link rel="describedby" type="application/rdf+xml" href="http://evan.status.net/foaf"/>
+      <Link rel="salmon" href="http://evan.status.net/main/salmon/user/1"/>
+      <Link rel="http://salmon-protocol.org/ns/salmon-replies" href="http://evan.status.net/main/salmon/user/1"/>
+      <Link rel="http://salmon-protocol.org/ns/salmon-mention" href="http://evan.status.net/main/salmon/user/1"/>
+      <Link rel="magic-public-key" href="data:application/magic-public-key,RSA.vyohOlwX03oJUg6R8BQP4V-6QQUfPg9gzOwk3ENQjqeGorHN8RNI4rhCQp7tACe9DEdEKtzZHbSvQC2zRICQ9JG_SIcpiU9jcT2imN5cPLZZQuPFZWwG4xPu_8LKRHuXeLGkzQMjvg6jFBl7qdo_iPnlbtIBb-mEuAnfRMcdUPE=.AQAB"/>
+      <Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://evan.status.net/main/ostatussub?profile={uri}"/>
+      </XRD>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2428aa6e..f3a82df41 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -113,174 +113,21 @@ end
   end
 
   def host_xrd
-    <<-XML
-  <?xml version='1.0' encoding='UTF-8'?>
-  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
-    <Link rel='lrdd' 
-          template='http://example.com/webfinger/?q={uri}'>
-      <Title>Resource Descriptor</Title>
-    </Link>
-  </XRD>
-    XML
+    File.open(File.dirname(__FILE__) + '/fixtures/host_xrd').read
   end
 
   def finger_xrd
-    <<-XML
-    <?xml version='1.0'?>
-    <XRD>
-    <Subject>acct:tom@tom.joindiaspora.com</Subject>
-    <Alias>"http://tom.joindiaspora.com/"</Alias>
-    <Link rel="http://microformats.org/profile/hcard" type="text/html" href="http://tom.joindiaspora.com/hcard/users/4c8eccce34b7da59ff000002"/>
-    <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="http://tom.joindiaspora.com/"/>
-    <Link rel="http://joindiaspora.com/guid" type="text/html" href="4c8eccce34b7da59ff000002"/>
-    <Link rel="diaspora-public-key" type="RSA" href="LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUNDZ0tDQWdFQXlt dHpUdWQ3SytXQklPVVYwMmxZN2Z1NjdnNWQrbTBra1ZIQlgzTk1uYXB5bnZL a0VSemoKbkxma2JrTVpEVGdPNG1UaThmWFI3Q1ZSK3Q1SFN4b2Vub0JWazVX eUFabkEzWmpTRjBPcC9RakhlYzhvK0dVSApDOFluNFJ5N01hQ0R1cUNpNnJv c2RlbUlLTm1Fa2dsVVY1VzZ4WFd4Vmtrb21oL2VCQ2FmaVdMTXFRMG82NGox Ckw3aXNjQjVOM3ZkbnBrUmU3SkFxLzNDUTI3dWhDS0ZIWG1JYm1iVmhJQTNC R0J6YStPV3NjK1Z5cjV0Mm1wSlIKU1RXMk9UL20rS0NPK21kdnpmenQ0TzEr UHc1M1pJMjRpMlc2cW1XdThFZ1Z6QVcyMStuRGJManZiNHpzVHlrNQppN1JM cG8rUFl2VUJlLy8wM1lkQUJoRlJhVXpTL0RtcWRubEVvb0VvK0VmYzRkQ1NF bWVkMUgrek01c2xqQm1rCks5amsvOHNQZDB0SVZmMWZXdW9BcWZTSmErSXdr OHNybkdZbEVlaFV1dVhIY0x2b2JlUXJKYWdiRGc1Qll5TnIKeTAzcHpKTHlS ZU9UcC9RK1p0TXpMOFJMZWJsUzlWYXdNQzNDVzc5K0RGditTWGZ0eTl3NC8w d2NpUHpKejg2bgp2VzJ5K3crTThOWG52enBWNU81dGI4azZxZ2N0WjBmRzFu eXQ0RklsSHNVaUVoNnZLZmNLSmFPeWFRSGNGcWVxCjkwUkpoMm9TMDJBdFJx TFRSWDJJQjFnYXZnWEFXN1NYanJNbUNlVzlCdVBKYU5nZkp3WFFaelVoa0tC V1k0VnMKZTRFVWRob3R5RWkvUmE0RXVZU01ZcnZEeUFRUHJsY0wveDliaU1p bHVPcU9OMEpJZ1VodEZQRUNBd0VBQVE9PQotLS0tLUVORCBSU0EgUFVCTElD IEtFWS0tLS0tCg== "/>
-    </XRD>
-    XML
+    File.open(File.dirname(__FILE__) + '/fixtures/finger_xrd').read
   end
 
   def hcard_response
-    <<-FOO
-   <div id="content"> 
-  <h1>Alexander Hamiltom</h1> 
-  <div id="content_inner"> 
-    <div id="i" class="entity_profile vcard author"> 
-      <h2>User profile</h2> 
-      <dl class="entity_nickname"> 
-        <dt>Nickname</dt> 
-        <dd> 
-        <a href="http://tom.joindiaspora.com/" rel="me" class="nickname url uid">Alexander Hamiltom</a> 
-        </dd> 
-      </dl> 
-        <dl class="entity_given_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="given_name" >Alexander</span> 
-        </dd> 
-        </dl>
-
-        <dl class="entity_family_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="family_name" >Hamiltom</span> 
-        </dd> 
-        </dl>
-        <dl class="entity_fn"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="fn" >Alexander Hamiltom</span> 
-        </dd> 
-      </dl> 
-      <dl class="entity_url"> 
-        <dt>URL</dt> 
-        <dd> 
-        <a href="http://tom.joindiaspora.com/" rel="me" id="pod_location" class="url">http://tom.joindiaspora.com/</a> 
-        </dd> 
-      </dl> 
-      <dl class="entity_note"> 
-        <dt>Note</dt> 
-        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd> 
-      </dl> 
-    </div> 
-  </div> 
-
-</div> 
-
-    FOO
+    File.open(File.dirname(__FILE__) + '/fixtures/hcard_response').read
   end
 
   def nonseed_finger_xrd
-    <<-XML
-      <XRD>
-      <Subject>acct:evan@status.net</Subject>
-      <Alias>acct:evan@evan.status.net</Alias>
-      <Alias>http://evan.status.net/user/1</Alias>
-      <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="http://evan.status.net/user/1"/>
-      <Link rel="http://schemas.google.com/g/2010#updates-from" href="http://evan.status.net/api/statuses/user_timeline/1.atom" type="application/atom+xml"/>
-      <Link rel="http://microformats.org/profile/hcard" type="text/html" href="http://evan.status.net/hcard"/>
-      <Link rel="http://gmpg.org/xfn/11" type="text/html" href="http://evan.status.net/user/1"/>
-      <Link rel="describedby" type="application/rdf+xml" href="http://evan.status.net/foaf"/>
-      <Link rel="salmon" href="http://evan.status.net/main/salmon/user/1"/>
-      <Link rel="http://salmon-protocol.org/ns/salmon-replies" href="http://evan.status.net/main/salmon/user/1"/>
-      <Link rel="http://salmon-protocol.org/ns/salmon-mention" href="http://evan.status.net/main/salmon/user/1"/>
-      <Link rel="magic-public-key" href="data:application/magic-public-key,RSA.vyohOlwX03oJUg6R8BQP4V-6QQUfPg9gzOwk3ENQjqeGorHN8RNI4rhCQp7tACe9DEdEKtzZHbSvQC2zRICQ9JG_SIcpiU9jcT2imN5cPLZZQuPFZWwG4xPu_8LKRHuXeLGkzQMjvg6jFBl7qdo_iPnlbtIBb-mEuAnfRMcdUPE=.AQAB"/>
-      <Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://evan.status.net/main/ostatussub?profile={uri}"/>
-      </XRD>
-    XML
+    File.open(File.dirname(__FILE__) + '/fixtures/nonseed_finger_xrd').read
   end
 
   def evan_hcard
-    <<-HCARD
-    <body id="hcard">
-
-  <div id="wrap">
-   <div id="core">
-    <dl id="site_nav_local_views">
-     <dt>Local views</dt>
-     <dd></dd>
-</dl>
-    <div id="content">
-     <h1>Evan Prodromou</h1>
-
-     <div id="content_inner">
-      <div id="i" class="entity_profile vcard author">
-       <h2>User profile</h2>
-       <dl class="entity_depiction">
-        <dt>Photo</dt>
-        <dd>
-         <img src="http://avatar.status.net/evan/1-96-20100726204409.jpeg" class="photo avatar" width="96" height="96" alt="evan"/>
-</dd>
-
-</dl>
-       <dl class="entity_nickname">
-        <dt>Nickname</dt>
-        <dd>
-         <a href="http://evan.status.net/" rel="me" class="nickname url uid">evan</a>
-</dd>
-</dl>
-       <dl class="entity_fn">
-        <dt>Full name</dt>
-
-        <dd>
-         <span class="fn">Evan Prodromou</span>
-</dd>
-</dl>
-       <dl class="entity_location">
-        <dt>Location</dt>
-        <dd class="label">Montreal, QC, Canada</dd>
-</dl>
-       <dl class="entity_url">
-
-        <dt>URL</dt>
-        <dd>
-         <a href="http://evan.prodromou.name/" rel="me" class="url">http://evan.prodromou.name/</a>
-</dd>
-</dl>
-       <dl class="entity_note">
-        <dt>Note</dt>
-        <dd class="note">Montreal hacker and entrepreneur. Founder of identi.ca, lead developer of StatusNet, CEO of StatusNet Inc.</dd>
-
-</dl>
-</div>
-</div>
-</div>
-</div>
-   <div id="footer">
-    <dl id="licenses">
-     <dt id="site_statusnet_license">StatusNet software license</dt>
-     <dd><p><strong>Evan Prodromou</strong> is a microblogging service brought to you by <a href="http://status.net/">Status.net</a>. It runs the <a href="http://status.net/">StatusNet</a> microblogging software, version 0.9.5, available under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">GNU Affero General Public License</a>.</p>
-
-</dd>
-     <dt id="site_content_license">Site content license</dt>
-     <dd id="site_content_license_cc">
-      <p>
-       <img id="license_cc" src="http://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative Commons Attribution 3.0" width="80" height="15"/>
- All Evan Prodromou content and data are available under the <a class="license" rel="external license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.</p>
-</dd>
-
-</dl>
-</div>
-</div>
-</body>
-  HCARD
- 
+    File.open(File.dirname(__FILE__) + '/fixtures/evan_hcard').read
   end
