diff --git a/app/controllers/box_organizer_controller.rb b/app/controllers/box_organizer_controller.rb
index c563801..254582f 100644
--- a/app/controllers/box_organizer_controller.rb
+++ b/app/controllers/box_organizer_controller.rb
@@ -68,7 +68,8 @@ class BoxOrganizerController < ApplicationController
         raise ArgumentError.new("Type %s is not allowed. Go away." % type)
       end
     else
-      @block_types = available_blocks
+      @center_block_types = Box.acceptable_center_blocks & available_blocks
+      @side_block_types = Box.acceptable_side_blocks & available_blocks
       @boxes = boxes_holder.boxes
       render :action => 'add_block', :layout => false
     end
diff --git a/app/views/box_organizer/_block_types.rhtml b/app/views/box_organizer/_block_types.rhtml
new file mode 100644
index 0000000..b8f9b83
--- /dev/null
+++ b/app/views/box_organizer/_block_types.rhtml
@@ -0,0 +1,12 @@
+<% 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 %>
+  </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 %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/box_organizer/add_block.rhtml b/app/views/box_organizer/add_block.rhtml
index 496b811..a1f9a19 100644
--- a/app/views/box_organizer/add_block.rhtml
+++ b/app/views/box_organizer/add_block.rhtml
@@ -2,25 +2,38 @@
 
   <p><%= _('In what area do you want to put your new block?') %></p>
 
-  <%# FIXME hardcoded stuff %>
-  <%= select_tag('box_id', options_for_select(@boxes.select { |item| item.position != 1 }.map {|item| [ _("Area %d") % item.position, item.id]})) %>
-  
-  <p><%= _('Select the type of block you want to add to your page.') %></p>
-  
-  <% @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 %>
-    </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 %>
-      </div>
-    <% end %>
+  <% @boxes.each do |box| %>
+    <%= radio_button_tag 'box-position', 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')) %>
--
libgit2 0.21.2