diff --git a/Gemfile b/Gemfile
index 05f47fb..f5f7641 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,6 +57,11 @@ group :development do
   gem 'capistrano-passenger'
 end
 
+group :development, :test do
+  gem 'pry-rails'
+  gem 'pry-byebug'
+end
+
 # Airbrake
 gem 'airbrake'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index db4f0ce..28d0afb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,7 @@ GEM
       climate_control (>= 0.0.3, < 1.0)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -145,6 +146,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
@@ -183,6 +185,20 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-x64-mingw32)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry-byebug (3.0.1)
+      byebug (~> 3.4)
+      pry (~> 0.10)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -274,6 +290,7 @@ GEM
     warden (1.2.3)
       rack (>= 1.0)
     will_paginate (3.0.7)
+    win32console (1.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -307,6 +324,8 @@ DEPENDENCIES
   omniauth-oauth2
   paper_trail (~> 4.0.0.beta)
   paperclip
+  pry-byebug
+  pry-rails
   rails (= 4.2)
   responders (~> 2.0)
   sass-rails (~> 4.0.3)
diff --git a/app/form_builders/formatted_form_builder.rb b/app/form_builders/formatted_form_builder.rb
index 02e0368..ced2d87 100644
--- a/app/form_builders/formatted_form_builder.rb
+++ b/app/form_builders/formatted_form_builder.rb
@@ -76,8 +76,12 @@ class FormattedFormBuilder < ActionView::Helpers::FormBuilder
 
   def submit_with_format(name = nil, options = {})
     options[:class] = submit_class unless options[:class]
-    content_tag :div, class: submit_wrapper_class do
-       submit_without_format(name, options)
+
+    content = submit_without_format(name, options)
+    if options[:skip_wrapper]
+      content
+    else
+      content_tag :div, content, class: submit_wrapper_class
     end
   end
 
diff --git a/app/views/orders/_price.html.erb b/app/views/orders/_price.html.erb
index e5d9862..1c52486 100644
--- a/app/views/orders/_price.html.erb
+++ b/app/views/orders/_price.html.erb
@@ -4,7 +4,7 @@
     <span class="input-group-addon">&euro;</span>
     <%= f.number_field :price, disabled: true, skip_label: true, step: :any, class: 'form-control big-form-field' %>
     <span class="input-group-btn">
-      <%= f.submit "Order!", class: "btn btn-primary big-form-button" %>
+      <%= f.submit "Order!", class: "btn btn-primary big-form-button", skip_wrapper: true %>
     </span>
   </div>
 </div>
diff --git a/db/schema.rb b/db/schema.rb
index 312cd4b..db31840 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -33,41 +33,41 @@ ActiveRecord::Schema.define(version: 20150827155036) do
   add_index "orders", ["user_id"], name: "index_orders_on_user_id"
 
   create_table "products", force: :cascade do |t|
-    t.string   "name",                                null: false
-    t.integer  "price_cents",         default: 0,     null: false
+    t.string   "name",                limit: 255,                 null: false
+    t.integer  "price_cents",                     default: 0,     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "avatar_file_name"
-    t.string   "avatar_content_type"
+    t.string   "avatar_file_name",    limit: 255
+    t.string   "avatar_content_type", limit: 255
     t.integer  "avatar_file_size"
     t.datetime "avatar_updated_at"
-    t.integer  "category",            default: 0
-    t.integer  "stock",               default: 0,     null: false
+    t.integer  "category",                        default: 0
+    t.integer  "stock",                           default: 0,     null: false
     t.integer  "calories"
-    t.boolean  "deleted",             default: false
+    t.boolean  "deleted",                         default: false
   end
 
   create_table "users", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",       default: 0,     null: false
+    t.integer  "sign_in_count",                   default: 0,     null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
+    t.string   "current_sign_in_ip",  limit: 255
+    t.string   "last_sign_in_ip",     limit: 255
     t.boolean  "admin"
     t.integer  "dagschotel_id"
-    t.string   "avatar_file_name"
-    t.string   "avatar_content_type"
+    t.string   "avatar_file_name",    limit: 255
+    t.string   "avatar_content_type", limit: 255
     t.integer  "avatar_file_size"
     t.datetime "avatar_updated_at"
-    t.integer  "orders_count",        default: 0
-    t.boolean  "koelkast",            default: false
+    t.integer  "orders_count",                    default: 0
+    t.boolean  "koelkast",                        default: false
     t.string   "provider"
     t.string   "uid"
-    t.string   "encrypted_password",  default: "",    null: false
-    t.boolean  "private",             default: false
+    t.string   "encrypted_password",              default: "",    null: false
+    t.boolean  "private",                         default: false
   end
 
   add_index "users", ["koelkast"], name: "index_users_on_koelkast"