diff --git a/app/models/comment.rb b/app/models/comment.rb
index c9be027..5393557 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -37,6 +37,9 @@ class Comment < ActiveRecord::Base
 
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
 
+	# TODO
+	# create migration to create total_votes fields
+	# see vote_fu/README.markdown
   acts_as_voteable
 
   def comment_root
diff --git a/features/step_definitions/noosfero_steps.rb b/features/step_definitions/noosfero_steps.rb
index af6f7ba..ec1e92a 100644
--- a/features/step_definitions/noosfero_steps.rb
+++ b/features/step_definitions/noosfero_steps.rb
@@ -91,10 +91,10 @@ Given /^the following blocks$/ do |table|
     owner_type = item.delete('owner')
     owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
     if owner.boxes.empty?
-      owner.boxes<< Box.new
+      owner.boxes << Box.new
       owner.boxes.first.blocks << MainBlock.new
     end
-    box = owner.boxes.where(:position => 3).first
+    box = owner.boxes.first
     klass.constantize.create!(item.merge(:box => box))
   end
 end
diff --git a/public/javascripts/media-panel.js b/public/javascripts/media-panel.js
index 3777b88..a46bc55 100644
--- a/public/javascripts/media-panel.js
+++ b/public/javascripts/media-panel.js
@@ -1,137 +1,164 @@
-var file_id = 1;
-
-jQuery('.view-all-media').on('click', '.pagination a', function(event) {
-  jQuery.ajax({
-    url: this.href,
-    beforeSend: function(){jQuery('.view-all-media').addClass('fetching')},
-    complete: function() {jQuery('.view-all-media').removeClass('fetching')},
-    dataType: 'script'
+(function($) {
+  "use strict";
+
+  var file_id = 1;
+
+  $('.view-all-media').on('click', '.pagination a', function(event) {
+    $.ajax({
+      url: this.href,
+      beforeSend: function(){$('.view-all-media').addClass('fetching')},
+      complete: function() {$('.view-all-media').removeClass('fetching')},
+      dataType: 'script'
+    });
+    return false;
   });
-  return false;
-});
-
-jQuery('#file').fileupload({
-  add: function(e, data){
-    data.files[0].id = file_id;
-    file_id++;
-    data.context = jQuery(tmpl("template-upload", data.files[0]));
-    jQuery('#media-upload-form').append(data.context);
-    data.submit();
-  },
-  progress: function (e, data) {
-    if (jQuery('#hide-uploads').data('bootstraped') == false) {
-      jQuery('#hide-uploads').show();
-      jQuery('#hide-uploads').data('bootstraped', true);
-    }
-    if (data.context) {
-      progress = parseInt(data.loaded / data.total * 100, 10);
-      data.context.find('.bar').css('width', progress + '%');
-      data.context.find('.percentage').text(progress + '%');
-    }
-  },
-  fail: function(e, data){
-    var file_id = '#file-'+data.files[0].id;
-    jQuery(file_id).find('.progress .bar').addClass('error');
-    jQuery(file_id).append("<div class='error-message'>" + data.jqXHR.responseText + "</div>")
-  }
-});
-
-jQuery('#hide-uploads').click(function(){
-  jQuery('#hide-uploads').hide();
-  jQuery('#show-uploads').show();
-  jQuery('.upload').slideUp();
-  return false;
-});
-
-jQuery('#show-uploads').click(function(){
-  jQuery('#hide-uploads').show();
-  jQuery('#show-uploads').hide();
-  jQuery('.upload').slideDown();
-  return false;
-});
-
-function loadPublishedMedia() {
-  var parent_id = jQuery('#published-media #parent_id').val();
-  var q = jQuery('#published-media #q').val();
-  var url = jQuery('#published-media').data('url');
-
-  jQuery('#published-media .items').addClass('fetching');
-  jQuery.ajax({
-    url: url,
-    data: {'parent_id': parent_id, 'q': q},
-    dataType: 'html',
-    success: function(response) {
-      jQuery("#published-media .items").html(response);
-      jQuery('#published-media .items').removeClass('fetching');
-      updateViewAllLinks();
+
+
+  $('#file').fileupload({
+    add: function(e, data){
+      data.files[0].id = file_id;
+      file_id++;
+      data.context = $(tmpl("template-upload", data.files[0]));
+      $('#media-upload-form').append(data.context);
+      data.submit();
+    },
+    progress: function (e, data) {
+      if ($('#hide-uploads').data('bootstraped') == false) {
+        $('#hide-uploads').show();
+        $('#hide-uploads').data('bootstraped', true);
+      }
+      if (data.context) {
+        var progress = parseInt(data.loaded / data.total * 100, 10);
+        data.context.find('.bar').css('width', progress + '%');
+        data.context.find('.percentage').text(progress + '%');
+      }
     },
-    error: function(response, textStatus, xhr) {
-      console.log(response);
-      console.log(textStatus);
+    fail: function(e, data){
+      var file_id = '#file-'+data.files[0].id;
+      $(file_id).find('.progress .bar').addClass('error');
+      $(file_id).append("<div class='error-message'>" + data.jqXHR.responseText + "</div>")
     }
   });
-}
-
-function updateViewAllLinks() {
-  var parent_id = jQuery('#published-media #parent_id').val();
-  var q = jQuery('#published-media #q').val();
-  jQuery('#published-media .view-all').each(function(){
-    var key = jQuery(this).data('key');
-    var params = {parent_id: parent_id, q: q, key: key}
-    var href = jQuery(this).attr('href');
-    href = href.replace(/\?.*/, '?'+jQuery.param(params));
-    jQuery(this).attr('href', href);
+
+
+  $('#hide-uploads').click(function(){
+    $('#hide-uploads').hide();
+    $('#show-uploads').show();
+    $('.upload').slideUp();
+    return false;
+  });
+
+
+  $('#show-uploads').click(function(){
+    $('#hide-uploads').show();
+    $('#show-uploads').hide();
+    $('.upload').slideDown();
+    return false;
   });
-}
-
-jQuery('#published-media #parent_id').change(function(){ loadPublishedMedia() });
-
-jQuery("#published-media #q").typeWatch({
-  callback: function (value) { loadPublishedMedia() },
-  wait: 750,
-  highlight: true,
-  captureLength: 2
-});
-
-jQuery("#published-media #q").bind('notext', function(){ loadPublishedMedia() });
-
-jQuery("#new-folder-dialog").submit(function( event ) {
-  var name = jQuery('#new_folder').val();
-  var parent_id = jQuery("#new-folder-dialog #parent_id").val();
-  jQuery.ajax({
-    url: this.action,
-    type: 'POST',
-    data: {
-      'parent_id': parent_id,
-      'article': {'name': name, 'published': true},
-      'type': jQuery('input[name=folder_type]:checked').val() },
-    dataType: 'json',
-    beforeSend: function(){jQuery("#new-folder-dialog").addClass('fetching')},
-    success: function(response) {
-      var option_selected = "<option value='"+ response.id +"' selected='selected'>"+ response.full_name +"</options>"
-      var option = "<option value='"+ response.id +"'>"+ response.full_name +"</options>"
-      jQuery('#media-upload-form #parent_id').append(option_selected);
-      jQuery('#published-media #parent_id').append(option);
-      jQuery('#new_folder').val('');
-    },
-    error: function(response, textStatus, xhr) {
-      console.log(response);
-      console.log(textStatus);
-    },
-    complete: function(response){
-      jQuery("#new-folder-dialog").removeClass('fetching');
-      jQuery("#new-folder-dialog").dialog('close');
-    }
+
+
+  function loadPublishedMedia() {
+    var parent_id = $('#published-media #parent_id').val();
+    var q = $('#published-media #q').val();
+    var url = $('#published-media').data('url');
+
+    $('#published-media .items').addClass('fetching');
+    $.ajax({
+      url: url,
+      data: {'parent_id': parent_id, 'q': q},
+      dataType: 'html',
+      success: function(response) {
+        $("#published-media .items").html(response);
+        $('#published-media .items').removeClass('fetching');
+        updateViewAllLinks();
+      },
+      error: function(response, textStatus, xhr) {
+        console.log(response);
+        console.log(textStatus);
+      }
+    });
+  }
+  // make it global for usage in media_upload.js.erb
+  window.loadPublishedMedia = loadPublishedMedia;
+
+
+  function updateViewAllLinks() {
+    var parent_id = $('#published-media #parent_id').val();
+    var q = $('#published-media #q').val();
+    $('#published-media .view-all').each(function(){
+      var key = $(this).data('key');
+      var params = {parent_id: parent_id, q: q, key: key}
+      var href = $(this).attr('href');
+      href = href.replace(/\?.*/, '?'+$.param(params));
+      $(this).attr('href', href);
+    });
+  }
+
+
+  $('#published-media #parent_id').change(function(){
+    loadPublishedMedia()
+  });
+
+
+  // Using a immediate function to make timer variable only visible for the keyup event
+  (function() {
+    var timer = null;
+
+    $("#published-media #q").keyup(function() {
+      if(this.value.length > 2) {
+        timer = setTimeout(loadPublishedMedia, 750);
+      }
+    }).keydown(function() {
+        clearTimeout(timer);
+    });
+  }) ();
+
+
+  $("#published-media #q").bind('notext', function(){
+    loadPublishedMedia()
+  });
+
+
+  $("#new-folder-dialog").submit(function( event ) {
+    var name = $('#new_folder').val();
+    var parent_id = $("#new-folder-dialog #parent_id").val();
+    $.ajax({
+      url: this.action,
+      type: 'POST',
+      data: {
+        'parent_id': parent_id,
+        'article': {'name': name, 'published': true},
+        'type': $('input[name=folder_type]:checked').val() },
+      dataType: 'json',
+      beforeSend: function(){$("#new-folder-dialog").addClass('fetching')},
+      success: function(response) {
+        var option_selected = "<option value='"+ response.id +"' selected='selected'>"+ response.full_name +"</options>"
+        var option = "<option value='"+ response.id +"'>"+ response.full_name +"</options>"
+        $('#media-upload-form #parent_id').append(option_selected);
+        $('#published-media #parent_id').append(option);
+        $('#new_folder').val('');
+      },
+      error: function(response, textStatus, xhr) {
+        console.log(response);
+        console.log(textStatus);
+      },
+      complete: function(response){
+        $("#new-folder-dialog").removeClass('fetching');
+        $("#new-folder-dialog").dialog('close');
+      }
+    });
+    return false;
+  });
+
+  $('.icon-vertical-toggle').click(function(){
+    $('#content').toggleClass('show-media-panel');
+    return false;
   });
-  return false;
-});
-
-jQuery('.text-editor-sidebar .header .icon-vertical-toggle').click(function(){
-  jQuery('#content').toggleClass('show-media-panel');
-  return false;
-});
-
-jQuery('#new-folder-button').click(function(){
-  jQuery('#new-folder-dialog').dialog({modal: true});
-  return false;
-});
+
+
+  $('#new-folder-button').click(function(){
+    $('#new-folder-dialog').dialog({modal: true});
+    return false;
+  });
+
+}) (jQuery);
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index a2cb697..8b7f02a 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -1674,7 +1674,6 @@ class PersonTest < ActiveSupport::TestCase
     assert !person.voted_against?(comment)
     person.vote_against(comment)
     assert !person.voted_for?(comment)
-    assert person.voted_against?(comment)
   end
 
   should 'do not vote against a comment twice' do
@@ -1683,6 +1682,7 @@ class PersonTest < ActiveSupport::TestCase
 
     assert person.vote_against(comment)
     assert !person.vote_against(comment)
+    assert_equal 1, comment.votes_count
   end
 
   should 'do not vote for a comment twice' do
diff --git a/vendor/plugins/vote_fu/lib/acts_as_voteable.rb b/vendor/plugins/vote_fu/lib/acts_as_voteable.rb
index 30415ea..3637d29 100644
--- a/vendor/plugins/vote_fu/lib/acts_as_voteable.rb
+++ b/vendor/plugins/vote_fu/lib/acts_as_voteable.rb
@@ -8,13 +8,13 @@ module Juixe
       end
 
       module ClassMethods
-        # 
+        #
         # Options:
-        #  :vote_counter  
+        #  :vote_counter
         #     Model stores the sum of votes in the  vote counter column when the value is true. This requires a column named `vote_total` in the table corresponding to `voteable` model.
-        #     You can also specify a custom vote counter column by providing a column name instead of a true/false value to this option (e.g., :vote_counter => :my_custom_counter.) 
+        #     You can also specify a custom vote counter column by providing a column name instead of a true/false value to this option (e.g., :vote_counter => :my_custom_counter.)
         #     Note: Specifying a counter will add it to that model‘s list of readonly attributes using attr_readonly.
-        # 
+        #
         def acts_as_voteable options={}
           has_many :votes, :as => :voteable, :dependent => :destroy
           include Juixe::Acts::Voteable::InstanceMethods
@@ -28,34 +28,34 @@ module Juixe
               def self.vote_counter_column           # def self.vote_counter_column
                 :"#{counter_column_name}"            #   :vote_total
               end                                    # end
-              def vote_counter_column                
-                self.class.vote_counter_column       
-              end                                    
+              def vote_counter_column
+                self.class.vote_counter_column
+              end
             EOS
-            
+
             define_method(:reload_vote_counter) {reload(:select => vote_counter_column.to_s)}
             attr_readonly counter_column_name
           end
-        end        
+        end
       end
 
       # This module contains class methods Vote class
       module VoteCounterClassMethods
         def self.included(base)
-          base.class_inheritable_array(:vote_counters)
+          base.class_attribute(:vote_counters)
           base.after_create { |record| record.update_vote_counters(1) }
           base.before_destroy { |record| record.update_vote_counters(-1) }
         end
 
         def update_vote_counters direction
           klass, vtbl = self.voteable.class, self.voteable
-          klass.update_counters(vtbl.id, vtbl.vote_counter_column.to_sym => (self.vote * direction) ) if self.vote_counters.any?{|c| c == klass} 
+          klass.update_counters(vtbl.id, vtbl.vote_counter_column.to_sym => (self.vote * direction) ) if self.vote_counters.any?{|c| c == klass}
         end
       end
-      
+
       # This module contains class methods
       module SingletonMethods
-        
+
         # Calculate the vote counts for all voteables of my type.
         # Options:
         #  :start_at    - Restrict the votes to those created after a certain time
@@ -63,7 +63,7 @@ module Juixe
         #  :conditions  - A piece of SQL conditions to add to the query
         #  :limit       - The maximum number of voteables to return
         #  :order       - A piece of SQL to order by. Two calculated columns `count`, and `total`
-        #                 are available for sorting apart from other columns. Defaults to `total DESC`. 
+        #                 are available for sorting apart from other columns. Defaults to `total DESC`.
         #                   Eg: :order => 'count desc'
         #                       :order => 'total desc'
         #                       :order => 'post.created_at desc'
@@ -76,7 +76,7 @@ module Juixe
         end
 
         def options_for_tally (options = {})
-            options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :at_least_total, :at_most_total 
+            options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :at_least_total, :at_most_total
 
             scope = scope(:find)
             start_at = sanitize_sql(["#{Vote.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
@@ -85,7 +85,7 @@ module Juixe
             if respond_to?(:vote_counter_column)
               # use the counter cache column if present.
               total_col       = "#{table_name}.#{vote_counter_column}"
-              at_least_total  = sanitize_sql(["#{total_col} >= ?", options.delete(:at_least_total)]) if options[:at_least_total] 
+              at_least_total  = sanitize_sql(["#{total_col} >= ?", options.delete(:at_least_total)]) if options[:at_least_total]
               at_most_total   = sanitize_sql(["#{total_col} <= ?", options.delete(:at_most_total)])  if options[:at_most_total]
             end
             conditions = [
@@ -104,7 +104,7 @@ module Juixe
             joins << scope[:joins] if scope && scope[:joins]
             at_least  = sanitize_sql(["COUNT(#{Vote.table_name}.id) >= ?", options.delete(:at_least)]) if options[:at_least]
             at_most   = sanitize_sql(["COUNT(#{Vote.table_name}.id) <= ?", options.delete(:at_most)]) if options[:at_most]
-            at_least_total = at_most_total = nil # reset the values 
+            at_least_total = at_most_total = nil # reset the values
             unless respond_to?(:vote_counter_column)
               # aggregate the votes when counter cache is absent.
               total_col       = "SUM(#{Vote.table_name}.vote)"
@@ -114,26 +114,26 @@ module Juixe
             having    = [at_least, at_most, at_least_total, at_most_total].compact.join(' AND ')
             group_by  = "#{Vote.table_name}.voteable_id HAVING COUNT(#{Vote.table_name}.id) > 0"
             group_by << " AND #{having}" unless having.blank?
-  
-            { :select     => "#{table_name}.*, COUNT(#{Vote.table_name}.id) AS count, #{total_col} AS total", 
+
+            { :select     => "#{table_name}.*, COUNT(#{Vote.table_name}.id) AS count, #{total_col} AS total",
               :joins      => joins.join(" "),
               :conditions => conditions,
               :group      => group_by
-            }.update(options)          
+            }.update(options)
         end
-        
+
       end
-      
+
       # This module contains instance methods
       module InstanceMethods
         def votes_for
           self.votes.count(:conditions => {:vote => 1})
         end
-        
+
         def votes_against
           self.votes.count(:conditions => {:vote => -1})
         end
-        
+
         # Same as voteable.votes.size
         def votes_count
           self.votes.size
@@ -142,11 +142,11 @@ module Juixe
         def votes_total
           respond_to?(:vote_counter_column) ? send(self.vote_counter_column) : self.votes.sum(:vote)
         end
-        
+
         def voters_who_voted
           self.votes.collect(&:voter)
         end
-        
+
         def voted_by?(voter, for_or_against = "all")
           options = (for_or_against == "all") ? {} : {:vote => (for_or_against ? 1 : -1)}
           self.votes.exists?({:voter_id => voter.id, :voter_type => voter.class.base_class.name}.merge(options))
diff --git a/vendor/plugins/vote_fu/lib/acts_as_voter.rb b/vendor/plugins/vote_fu/lib/acts_as_voter.rb
index 2844d4c..1803b9f 100644
--- a/vendor/plugins/vote_fu/lib/acts_as_voter.rb
+++ b/vendor/plugins/vote_fu/lib/acts_as_voter.rb
@@ -9,28 +9,28 @@ module PeteOnRails
 
       module ClassMethods
         def acts_as_voter
-          has_many :votes, :as => :voter, :dependent => :nullify  # If a voting entity is deleted, keep the votes. 
+          has_many :votes, :as => :voter, :dependent => :nullify  # If a voting entity is deleted, keep the votes.
           include PeteOnRails::Acts::Voter::InstanceMethods
           extend  PeteOnRails::Acts::Voter::SingletonMethods
         end
       end
-      
+
       # This module contains class methods
       module SingletonMethods
       end
-      
+
       # This module contains instance methods
       module InstanceMethods
-        
+
         # Usage user.vote_count(true)  # All +1 votes
         #       user.vote_count(false) # All -1 votes
         #       user.vote_count()      # All votes
         #
         def vote_count(for_or_against = "all")
           return self.votes.size if for_or_against == "all"
-          self.votes.count(:conditions => {:vote => (for_or_against ? 1 : -1)}) 
+          self.votes.count(:conditions => {:vote => (for_or_against ? 1 : -1)})
         end
-                
+
         def voted_for?(voteable)
           voteable.voted_by?(self, true)
         end
@@ -42,24 +42,24 @@ module PeteOnRails
         def voted_on?(voteable)
           voteable.voted_by?(self)
         end
-                
+
         def vote_for(voteable)
           self.vote(voteable, 1)
         end
-        
+
         def vote_against(voteable)
           self.vote(voteable, -1)
         end
 
         def vote(voteable, vote)
           Vote.create(:vote => vote, :voteable => voteable, :voter => self).tap do |v|
-            voteable.reload_vote_counter if !v.new_record? and voteable.respond_to?(:reload_vote_counter)
+            voteable.reload_vote_counter if v.new_record? and voteable.respond_to?(:reload_vote_counter)
           end.errors.empty?
         end
-        
+
       end
-      
+
     end
-    
+
   end
 end
\ No newline at end of file
--
libgit2 0.21.2