diff --git a/Gemfile b/Gemfile
index 45ba9215..2d107531 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'locomotive_liquid', '2.2.2', :require => 'liquid'
 gem 'formtastic', '~> 1.2.3'
 gem 'inherited_resources', '~> 1.1.2'
 
-gem 'rmagick', '2.12.2'
+gem 'rmagick', '2.12.2', :require => 'RMagick'
 gem 'locomotive_carrierwave', '0.5.4.beta3'
 gem 'dragonfly',  '~> 0.9.1'
 gem 'rack-cache', :require => 'rack/cache'
diff --git a/Rakefile b/Rakefile
index 995d37e8..a0405251 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,7 @@ require File.expand_path('../config/application', __FILE__)
 
 require 'rubygems'
 
+require 'rake/dsl_definition'
 require 'rake'
 require 'rdoc/task'
 require 'rubygems/package_task'
diff --git a/doc/TODO b/doc/TODO
index 2660346c..3a2aea78 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -71,9 +71,8 @@ x Rights to set roles (ticket #104)
 x export: problems with templatized pages (source => multi levels pages)
 x do not rename files for fonts
 x icon for redirection page in the pages section (back-office)
-- test and/or convert existing templates (the 2 of the themes section)
 - installed on heroku with source
-
+- test and/or convert existing templates (the 2 of the themes section)
 
 BACKLOG:
 
diff --git a/public/stylesheets/admin/box.css b/public/stylesheets/admin/box.css
index 3680a506..8104c205 100644
--- a/public/stylesheets/admin/box.css
+++ b/public/stylesheets/admin/box.css
@@ -70,7 +70,7 @@ body { background: #000 url(/images/admin/background/body.png) repeat 0 0; }
   padding: 0px;
 }
 
-#panel fieldset ol li p.inline-errors {
+#panel fieldset ol li div.inline-errors p {
   padding: 3px 5px;
   margin: 5px 0px;
   background: #FFE5E5;
diff --git a/public/stylesheets/admin/editable_elements.css b/public/stylesheets/admin/editable_elements.css
index 60461d3e..3ef9b739 100644
--- a/public/stylesheets/admin/editable_elements.css
+++ b/public/stylesheets/admin/editable_elements.css
@@ -1,7 +1,6 @@
 #editable-elements .wrapper {
   background: #ebedf4 url(/images/admin/form/footer.png) no-repeat 0 bottom;
-  width: 880px;
-  padding: 10px 20px 0px 20px;
+  padding: 10px 0px 16px 0px;
   border-top: 1px solid #ccced7;
 }
 
@@ -57,9 +56,4 @@
 
 #editable-elements .wrapper ul li fieldset { margin-bottom: 0px; }
 
-#editable-elements .wrapper ul li fieldset ol { margin-top: 0px; border-top: 0px; background: #EBEDF4; }
-#editable-elements .wrapper ul li fieldset ol li label { padding-left: 0px; padding-right: 3em; }
-#editable-elements .wrapper ul li fieldset ol li p.remove,
-#editable-elements .wrapper ul li fieldset ol li p.inline-hints { margin-left: 13.3em; }
-#editable-elements .wrapper ul li fieldset ol li input[type=text] { width: 695px; }
-
+#editable-elements .wrapper ul li fieldset ol { margin-top: 0px; border-top: 0px; background: #EBEDF4; }
\ No newline at end of file