diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index b049f44e8..e2048daf3 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -8,11 +8,11 @@
     .right
       #add_photo_loader
         = image_tag 'ajax-loader.gif'
-      = link_to 'Add Photos', '#add_photo_pane', {:class => 'button', :id => 'add_photo_button'}
+      #add_photo_button
+        = link_to 'Add Photos', '#', :class => 'button'
     
-    .yo{:style => 'display:none;'}
-      #add_photo_pane
-        = render "photos/new_photo", :photo => @photo, :album => @album
+    #add_photo_pane.contextual_pane
+      = render "photos/new_photo", :photo => @photo, :album => @album
 
 .sub_header
   ="updated #{how_long_ago(@album)}"
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index 4a7023687..cd83d648d 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -10,10 +10,13 @@
       onFinish: function(event, total){
         $("#add_photo_button .button").html( "Add Photos" );
         $("#add_photo_loader").fadeOut(400);
+        pane_toggler_button("photo")
       },
       onStart: function(event, total){
+        $("#add_photo_pane").fadeOut(400);
         $("#add_photo_button .button").html( "Uploading Photos" );
         $("#add_photo_loader").fadeIn(400);
+        $("#add_photo_button").unbind();
         return true;
       }
     });
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index d5a1cc51e..e91e6a912 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -82,10 +82,12 @@ $(document).ready(function(){
 
   //buttons//////
   
-  pane_toggler_button("album");
-  pane_toggler_button("group");
+
+  $("#add_album_button").fancybox();
+  $("#add_group_button").fancybox();
+  $("#add_request_button").fancybox();
+
   pane_toggler_button("photo");
-  pane_toggler_button("request");
 
   $("input[type='submit']").addClass("button");
 
@@ -106,8 +108,6 @@ $(document).ready(function(){
 
 function pane_toggler_button( name ) {
   
-  $("#add_" + name + "_button").fancybox();
-  /*
     $("#add_" + name + "_button").toggle(
     function(evt){
       evt.preventDefault();
@@ -117,5 +117,4 @@ function pane_toggler_button( name ) {
       $("#add_" + name +"_pane").fadeOut(200);
     }
   );
-  */
 }