diff --git a/plugins/container_block/public/style.css b/plugins/container_block/public/style.css
index f569fab..94d8714 100644
--- a/plugins/container_block/public/style.css
+++ b/plugins/container_block/public/style.css
@@ -1,3 +1,9 @@
+#box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar {
+  height: auto;
+  padding-bottom: 0px;
+  width: auto;
+}
+
 #content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
   display: inline-block;
   vertical-align: top;
@@ -17,14 +23,10 @@
   background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
 }
 
-#content .boxes .container-block-plugin_container-block .block {
-  outline-offset: -2px;
-}
-
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-handle {
   width: 10px;
   height: 28px;
-  z-index: 0;
+  z-index: 1000;
 }
 
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
@@ -37,6 +39,20 @@
   background-image: url(/plugins/container_block/images/handle_w.png);
 }
 
-.container-block-plugin_container-block .button-bar .icon-resize {
+.container-block-plugin_container-block .container-block-button-bar .icon-resize {
   background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
 }
+
+#box-organizer .block .container-block-button-bar {
+  right: 0px;
+  bottom: 0px;
+}
+
+#box-organizer .container-block-plugin_container-block:hover .block {
+  outline: 1px dashed black;
+  outline-offset: -1px;
+}
+
+.container-block-plugin_container-block .block-target {
+  background: #afd;
+}
diff --git a/plugins/container_block/views/blocks/container.rhtml b/plugins/container_block/views/blocks/container.rhtml
index 8feb078..8fb3f53 100644
--- a/plugins/container_block/views/blocks/container.rhtml
+++ b/plugins/container_block/views/blocks/container.rhtml
@@ -15,7 +15,7 @@
 </style>
 
 <% if edit_mode %>
-  <div class="button-bar">
+  <div class="container-block-button-bar button-bar">
     <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
     <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id }, 
                            :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f5a52af..433346b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1727,8 +1727,8 @@ a.button.disabled, input.disabled {
   display: none;
 }
 
-#box-organizer .block:focus .button-bar,
-#box-organizer .block:hover .button-bar {
+#box-organizer .block-outer:focus .button-bar,
+#box-organizer .block-outer:hover .button-bar {
   display: block;
 }
 
--
libgit2 0.21.2