diff --git a/app/views/box_organizer/_block_types.rhtml b/app/views/box_organizer/_block_types.rhtml
deleted file mode 100644
index 4b1c354..0000000
--- a/app/views/box_organizer/_block_types.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% block_types.in_groups_of(2) do |block1, block2| %>
-  <div style='float: left; width: 48%; padding-top: 2px;'>
-    <%= labelled_radio_button(block1.description, :type, block1.name) %>
-  </div>
-  <% if block2 %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= labelled_radio_button(block2.description, :type, block2.name) %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/app/views/box_organizer/add_block.rhtml b/app/views/box_organizer/add_block.rhtml
index dbb2391..ffb30e9 100644
--- a/app/views/box_organizer/add_block.rhtml
+++ b/app/views/box_organizer/add_block.rhtml
@@ -1,35 +1,41 @@
-<div style='height:350px'>
+<div id="add-block-dialog">
   <% form_tag do %>
 
     <p><%= _('In what area do you want to put your new block?') %></p>
 
+    <div id="box-position">
     <% @boxes.each do |box| %>
-      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+      <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
+      <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
     <% end %>
+    </div>
 
     <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);
+      jQuery('#box-position input').bind('change',
+        function () {
+          showCenter = jQuery(this).attr('data-position') == '1';
+          jQuery('#center-block-types').toggle(showCenter);
+          jQuery('#side-block-types').toggle(!showCenter);
+        }
+      );
     </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 id="center-block-types" class="block-types">
+      <% @center_block_types.each do |block| %>
+        <div>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
 
-    <div id='side-block-types' style='display:none'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    <div id="side-block-types" class="block-types" style="display:none">
+      <% @side_block_types.each do |block| %>
+        <div>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
 
     <br style='clear: both'/>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e0cc7a6..af1e93a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1666,6 +1666,18 @@ a.button.disabled, input.disabled {
   padding: 0px 30px;
 }
 
+#add-block-dialog {
+  display: inline-block;
+  padding: 0px 5px 0px 20px;
+}
+
+#add-block-dialog .block-types {
+  column-count: 2;
+  -ms-column-count: 2;
+  -moz-column-count: 2;
+  -webkit-column-count: 2;
+}
+
 /* ==> blocks/tags-block.css <<= */ 
 
 .tags-block {
--
libgit2 0.21.2