diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb
index 4cb86c4..04d94c4 100644
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -205,7 +205,7 @@ module BoxesHelper
     end
 
     if block.editable?
-      buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+      buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
     end
 
     if !block.main?
diff --git a/app/helpers/colorbox_helper.rb b/app/helpers/colorbox_helper.rb
index 7002f10..24bedc5 100644
--- a/app/helpers/colorbox_helper.rb
+++ b/app/helpers/colorbox_helper.rb
@@ -8,6 +8,10 @@ module ColorboxHelper
     button(type, label, url, colorbox_options(options))
   end
 
+  def colorbox_icon_button(type, label, url, options = {})
+    icon_button(type, label, url, colorbox_options(options))
+  end
+
   # options must be an HTML options hash as passed to link_to etc.
   #
   # returns a new hash with colorbox class added. Keeps existing classes.
diff --git a/app/views/box_organizer/_block_types.rhtml b/app/views/box_organizer/_block_types.rhtml
index b8f9b83..4b1c354 100644
--- a/app/views/box_organizer/_block_types.rhtml
+++ b/app/views/box_organizer/_block_types.rhtml
@@ -1,12 +1,10 @@
 <% block_types.in_groups_of(2) do |block1, block2| %>
   <div style='float: left; width: 48%; padding-top: 2px;'>
-    <%= radio_button_tag('type', block1.name) %>
-    <%= label_tag "type_#{block1.name.downcase}", block1.description %>
+    <%= labelled_radio_button(block1.description, :type, block1.name) %>
   </div>
   <% if block2 %>
     <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= radio_button_tag('type', block2.name) %>
-      <%= label_tag "type_#{block2.name.downcase}", block2.description %>
+      <%= labelled_radio_button(block2.description, :type, block2.name) %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/box_organizer/_highlights_block.rhtml b/app/views/box_organizer/_highlights_block.rhtml
index ddc74fa..90be8b3 100644
--- a/app/views/box_organizer/_highlights_block.rhtml
+++ b/app/views/box_organizer/_highlights_block.rhtml
@@ -1,5 +1,5 @@
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block'>
+<div id='edit-highlights-block' style='width:450px'>
 <table id='highlights' class='noborder'>
   <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
   <% for image in @block.images do %>
diff --git a/app/views/box_organizer/_link_list_block.rhtml b/app/views/box_organizer/_link_list_block.rhtml
index f7102a7..2ca7ed9 100644
--- a/app/views/box_organizer/_link_list_block.rhtml
+++ b/app/views/box_organizer/_link_list_block.rhtml
@@ -1,5 +1,5 @@
 <strong><%= _('Links') %></strong>
-<div id='edit-link-list-block'>
+<div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
   <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
   <% for link in @block.links do %>
diff --git a/app/views/box_organizer/_raw_html_block.rhtml b/app/views/box_organizer/_raw_html_block.rhtml
index 8c84f98..f40443c 100644
--- a/app/views/box_organizer/_raw_html_block.rhtml
+++ b/app/views/box_organizer/_raw_html_block.rhtml
@@ -1 +1 @@
-<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 100%', :rows => 15)) %>
+<%= labelled_form_field(_('HTML code'), text_area(:block, :html, :style => 'width: 90%', :rows => 15)) %>
diff --git a/app/views/box_organizer/add_block.rhtml b/app/views/box_organizer/add_block.rhtml
index 502c059..dbb2391 100644
--- a/app/views/box_organizer/add_block.rhtml
+++ b/app/views/box_organizer/add_block.rhtml
@@ -1,42 +1,43 @@
-<% form_tag do %>
+<div style='height:350px'>
+  <% form_tag do %>
+
+    <p><%= _('In what area do you want to put your new block?') %></p>
+
+    <% @boxes.each do |box| %>
+      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+    <% end %>
+
+    <script type="text/javascript">
+      (function ($) {
+        $(document).ready(function () {
+          $(".box-position").live('change', function () {
+            if ($(this).attr('data-position') == '1') {
+              $('#center-block-types').show();
+              $('#side-block-types').hide();
+            } else {
+              $('#center-block-types').hide();
+              $('#side-block-types').show();
+            };
+          });
+      })})(jQuery);
+    </script>
+
+    <p><%= _('Select the type of block you want to add to your page.') %></p>
+
+    <div id='center-block-types'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
+    </div>
+
+    <div id='side-block-types' style='display:none'>
+      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    </div>
+
+    <br style='clear: both'/>
+
+    <% button_bar do %>
+      <%= submit_button(:add, _("Add")) %>
+      <%= colorbox_close_button(_('Close')) %>
+    <% end %>
 
-  <p><%= _('In what area do you want to put your new block?') %></p>
-
-  <% @boxes.each do |box| %>
-    <%= radio_button_tag 'box_id', box.id, box.central?, { :class => 'box-position', 'data-position' => box.position } %>
-    <%= label_tag _("Area %d") % box.position %>
-  <% end %>
-
-  <script type="text/javascript">
-    (function ($) {
-      $(document).ready(function () {
-        $(".box-position").live('change', function () {
-          if ($(this).attr('data-position') == '1') {
-            $('#center-block-types').show();
-            $('#side-block-types').hide();
-          } else {
-            $('#center-block-types').hide();
-            $('#side-block-types').show();
-          };
-        });
-    })})(jQuery);
-  </script>
-
-  <p><%= _('Select the type of block you want to add to your page.') %></p>
-
-  <div id='center-block-types'>
-    <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
-  </div>
-
-  <div id='side-block-types' style='display:none'>
-    <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
-  </div>
-
-  <br style='clear: both'/>
-
-  <% button_bar do %>
-    <%= submit_button(:add, _("Add")) %>
-    <%= lightbox_close_button(_('Close')) %>
   <% end %>
-
-<% end %>
+</div>
diff --git a/app/views/box_organizer/edit.rhtml b/app/views/box_organizer/edit.rhtml
index 6aa54f5..ff238f6 100644
--- a/app/views/box_organizer/edit.rhtml
+++ b/app/views/box_organizer/edit.rhtml
@@ -1,31 +1,33 @@
-<h2><%= _('Editing block') %></h2>
+<div style='width: 500px;'>
+  <h2><%= _('Editing block') %></h2>
 
-<% form_tag(:action => 'save', :id => @block.id) do %>
+  <% form_tag(:action => 'save', :id => @block.id) do %>
 
-  <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
+    <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
 
-  <%= render :partial => partial_for_class(@block.class) %>
+    <%= render :partial => partial_for_class(@block.class) %>
 
-  <%= labelled_form_field _('Display this block:'), '' %>
-  <div style='margin-left: 10px'>
-    <%= radio_button(:block, :display, 'always') %>
-    <%= label_tag('block_display_always', _('In all pages')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'home_page_only') %>
-    <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'except_home_page') %>
-    <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
-    <br/>
-    <%= radio_button(:block, :display, 'never') %>
-    <%= label_tag('block_display_never', _("Don't display")) %>
-  </div>
+    <%= labelled_form_field _('Display this block:'), '' %>
+    <div style='margin-left: 10px'>
+      <%= radio_button(:block, :display, 'always') %>
+      <%= label_tag('block_display_always', _('In all pages')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'home_page_only') %>
+      <%= label_tag('block_display_home_page_only', _('Only in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'except_home_page') %>
+      <%= label_tag('block_display_except_home_page', _('In all pages, except in the homepage')) %>
+      <br/>
+      <%= radio_button(:block, :display, 'never') %>
+      <%= label_tag('block_display_never', _("Don't display")) %>
+    </div>
 
-  <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + Noosfero.locales.map {|key, value| [value, key]} )) %>
+    <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + Noosfero.locales.map {|key, value| [value, key]} )) %>
 
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-    <%= lightbox_close_button(_('Cancel')) %>
-  <% end %>
+    <% button_bar do %>
+      <%= submit_button(:save, _('Save')) %>
+      <%= colorbox_close_button(_('Cancel')) %>
+    <% end %>
 
-<% end %>
+  <% end %>
+</div>
diff --git a/app/views/box_organizer/index.rhtml b/app/views/box_organizer/index.rhtml
index e49a906..9a53b74 100644
--- a/app/views/box_organizer/index.rhtml
+++ b/app/views/box_organizer/index.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _('Editing sideboxes')%></h1>
 
 <% button_bar do %>
-  <%= lightbox_button('add', _('Add a block'), { :action => 'add_block' }) %> 
+  <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index d726634..9c271ee 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -922,7 +922,7 @@ jQuery(function($) {
   $('.colorbox').live('click', function() {
     $.fn.colorbox({
       href:$(this).attr('href'),
-      maxWidth: '500',
+      maxWidth: '600',
       maxHeight: '550',
       open:true
     });
diff --git a/test/unit/colorbox_helper_test.rb b/test/unit/colorbox_helper_test.rb
index dc480d5..129aa8c 100644
--- a/test/unit/colorbox_helper_test.rb
+++ b/test/unit/colorbox_helper_test.rb
@@ -27,4 +27,10 @@ class ColorboxHelperTest < ActiveSupport::TestCase
     assert_equal '[button]', colorbox_button('type', 'label', { :action => 'popup'})
   end
 
+  should 'provide colorbox_icon_button' do
+    expects(:icon_button).with('type', 'label', { :action => 'popup'}, has_entries({ :class => 'colorbox' })).returns('[button]')
+
+    assert_equal '[button]', colorbox_icon_button('type', 'label', { :action => 'popup'})
+  end
+
 end
--
libgit2 0.21.2