diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 9cfdf6f03..26738aea9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,7 +9,7 @@
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "application"
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery142', 'rails', 'view'
+    = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher'
     = javascript_include_tag 'tiny_mce/tiny_mce.js','jquery.infieldlabel'
     :javascript
       var _gaq = _gaq || [];
@@ -62,28 +62,8 @@
 
           $("label").inFieldLabels();
         });
-  /= javascript_include_tag 'satisfaction' , 'satisfaction-display'
-  :javascript
-    var is_ssl = ("https:" == document.location.protocol);
-    var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
-    document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
-
-  :javascript
-
-    var feedback_widget_options = {};
-
-    feedback_widget_options.display = "overlay";  
-    feedback_widget_options.company = "diaspora";
-    feedback_widget_options.placement = "right";
-    feedback_widget_options.color = "#222";
-    feedback_widget_options.style = "idea";
-    
-    var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-      
-  
-  
-  
   
+  = javascript_include_tag 'satisfaction' , 'satisfaction-display'
   %body
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 0cf84b439..c918c3ac8 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -28,32 +28,6 @@
     margin-right: 20px;
   }
 
-:javascript
-  $(document).ready( function() {
-
-    $("#publisher_content_pickers li .status_message").click(function(){
-      if( $("#new_status_message").css("display") == "none" ) {
-        $("#publisher_form form").fadeOut(50);
-        $("#new_status_message").delay(50).fadeIn(200);
-      }
-    });
-
-    $("#publisher_content_pickers li .bookmark").click(function(){
-      if( $("#new_bookmark").css("display") == "none" ) {
-        $("#publisher_form form").fadeOut(50);
-        $("#new_bookmark").delay(50).fadeIn(200);
-      }
-    });
-
-    $("#publisher_content_pickers li .blog").click(function(){
-      if( $("#new_blog").css("display") == "none" ) {
-        $("#publisher_form form").fadeOut(50);
-        $("#new_blog").delay(50).fadeIn(200);
-      }
-    });
-
-  });
-
 #publisher
   %ul#publisher_content_pickers
     %a{ :class => "status_message", :href => '#', :title => "new status message."}
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
new file mode 100644
index 000000000..61c39f67f
--- /dev/null
+++ b/public/javascripts/publisher.js
@@ -0,0 +1,24 @@
+  $(document).ready( function() {
+
+    $("#publisher_content_pickers .status_message").click(function(){
+      if( $("#new_status_message").css("display") == "none" ) {
+        $("#publisher_form form").fadeOut(50);
+        $("#new_status_message").delay(50).fadeIn(200);
+      }
+    });
+
+    $("#publisher_content_pickers  .bookmark").click(function(){
+      if( $("#new_bookmark").css("display") == "none" ) {
+        $("#publisher_form form").fadeOut(50);
+        $("#new_bookmark").delay(50).fadeIn(200);
+      }
+    });
+
+    $("#publisher_content_pickers  .blog").click(function(){
+      if( $("#new_blog").css("display") == "none" ) {
+        $("#publisher_form form").fadeOut(50);
+        $("#new_blog").delay(50).fadeIn(200);
+      }
+    });
+
+  });
diff --git a/public/javascripts/satisfaction-display.js b/public/javascripts/satisfaction-display.js
index 57fb36012..e72e66809 100644
--- a/public/javascripts/satisfaction-display.js
+++ b/public/javascripts/satisfaction-display.js
@@ -1,8 +1,8 @@
   var feedback_widget_options = {};
 
-  feedback_widget_options.display = "inline";  
+  feedback_widget_options.display = "overlay";  
   feedback_widget_options.company = "diaspora";
-  feedback_widget_options.placement = "left";
+  feedback_widget_options.placement = "right";
   feedback_widget_options.color = "#222";
   feedback_widget_options.style = "idea";
   
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index ba577c5e5..4d35166cb 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -48,5 +48,6 @@ $(document).ready(function(){
 	
 	
 	$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
-	
+  
+
 });//end document ready
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9752fabbb..c02f0b259 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -274,9 +274,7 @@ textarea
   :height 18px
   :display block
   :width 100%
-
   :-moz-box-shadow 0 2px 0px #fff
-
   :border-top 1px solid #999
 
 input[type='submit']