diff --git a/plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb b/plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
index f8d2595..2cd4749 100644
--- a/plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
+++ b/plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
@@ -3,6 +3,8 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
   settings_items :show_cms_action, :type => :boolean, :default => true
   settings_items :show_profile, :type => :boolean, :default => true
 
+  attr_accessible :show_cms_action, :show_profile
+
   def self.description
     _('Content Breadcrumbs')
   end
@@ -35,7 +37,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
 
   def content(args={})
     block = self
-    lambda do
+    proc do
       trail = block.trail(@page, @profile, params)
       if !trail.empty?
         trail.map { |t| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator'))
diff --git a/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb b/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
index ceda959..fa7e6ba 100644
--- a/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
+++ b/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb
@@ -17,8 +17,8 @@ class ProfileDesignControllerTest < ActionController::TestCase
     @profile = fast_create(Community, :environment_id => @environment.id)
     @page = fast_create(Folder, :profile_id => @profile.id)
 
-    box = Box.create!(:owner => @profile)
-    @block = BreadcrumbsPlugin::ContentBreadcrumbsBlock.create!(:box => box)
+    box = create(Box, :owner => @profile)
+    @block = create(BreadcrumbsPlugin::ContentBreadcrumbsBlock, :box => box)
 
     user = create_user('testinguser')
     @profile.add_admin(user.person)
diff --git a/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb b/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb
new file mode 100644
index 0000000..8692a79
--- /dev/null
+++ b/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb
@@ -0,0 +1,4 @@
+<div id='edit-breadcrumbs-block'>
+  <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
+  <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
+</div>
diff --git a/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.rhtml b/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.rhtml
deleted file mode 100644
index 8692a79..0000000
--- a/plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id='edit-breadcrumbs-block'>
-  <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
-  <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
-</div>
--
libgit2 0.21.2