diff --git a/Gemfile b/Gemfile
index c9b1db4..c2bc9f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,8 @@ group :development do
   gem 'ruby_parser'
   gem 'hpricot'
   gem 'powder'
+  gem 'better_errors'
+  gem "binding_of_caller"
 end
 
 gem "newrelic_rpm"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e3548d..5874c20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,31 +8,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_markup (1.4.2)
@@ -52,8 +52,14 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
+    better_errors (0.6.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.6.9)
+      debug_inspector (>= 0.0.1)
     builder (3.0.4)
     cocaine (0.4.2)
+    coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -61,6 +67,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
+    debug_inspector (0.0.2)
     devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -80,14 +87,14 @@ GEM
     jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    newrelic_rpm (3.5.6.46)
+    mime-types (1.21)
+    multi_json (1.6.1)
+    newrelic_rpm (3.5.6.55)
     nokogiri (1.5.6)
     orm_adapter (0.4.0)
     paperclip (3.4.0)
@@ -102,31 +109,31 @@ GEM
     polyglot (0.3.3)
     powder (0.1.8)
       thor (>= 0.11.5)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rdiscount (1.6.8)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
     ruby_parser (3.1.1)
       sexp_processor (~> 4.1)
@@ -173,6 +180,8 @@ PLATFORMS
 DEPENDENCIES
   acts_as_markup
   aws-sdk
+  better_errors
+  binding_of_caller
   coffee-rails (~> 3.2.0)
   devise
   exception_notification!
diff --git a/app/assets/stylesheets/admin/formtastic.css.sass b/app/assets/stylesheets/admin/formtastic.css.sass
index 0007166..b731e19 100644
--- a/app/assets/stylesheets/admin/formtastic.css.sass
+++ b/app/assets/stylesheets/admin/formtastic.css.sass
@@ -89,7 +89,7 @@ form.formtastic
   fieldset.inputs
     padding: 1em 0
     border-bottom: 1px solid #ccc
-  fieldset.buttons
+  fieldset.actions
     padding: 1.5em 0 1em
   .stringish, .text
     input, textarea
diff --git a/app/views/admin/admin_users/_form.html.haml b/app/views/admin/admin_users/_form.html.haml
index 0fed776..2082c35 100644
--- a/app/views/admin/admin_users/_form.html.haml
+++ b/app/views/admin/admin_users/_form.html.haml
@@ -1,3 +1,3 @@
 = semantic_form_for [:admin, admin_user] do |f|
   = f.inputs :email
-  = f.buttons
\ No newline at end of file
+  = f.actions
diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml
index 1cc8787..7961630 100644
--- a/app/views/admin/categories/_form.html.haml
+++ b/app/views/admin/categories/_form.html.haml
@@ -1,3 +1,3 @@
 = semantic_form_for [:admin, category] do |f|
   = f.inputs :name, :description, :base_colour, :sort
-  = f.buttons
\ No newline at end of file
+  = f.actions
diff --git a/app/views/admin/confirmations/new.html.haml b/app/views/admin/confirmations/new.html.haml
index e3e870b..f2552f9 100644
--- a/app/views/admin/confirmations/new.html.haml
+++ b/app/views/admin/confirmations/new.html.haml
@@ -5,7 +5,7 @@
   = f.inputs do
     = f.input :email
   
-  = f.buttons do
+  = f.actions do
     = f.submit "Resend confirmation instructions"
 
 = render :partial => "devise/shared/links"
diff --git a/app/views/admin/confirmations/show.html.haml b/app/views/admin/confirmations/show.html.haml
index c0d5022..1ce06d4 100644
--- a/app/views/admin/confirmations/show.html.haml
+++ b/app/views/admin/confirmations/show.html.haml
@@ -8,5 +8,5 @@
         = f.input :password, :label => 'Choose a Password'
         = f.input :password_confirmation, :label => 'Confirm Password'
       = hidden_field_tag :confirmation_token,@confirmation_token
-  = f.buttons do
+  = f.actions do
     = f.submit "Activate"
diff --git a/app/views/admin/pages/_form.html.haml b/app/views/admin/pages/_form.html.haml
index ed135a0..21be10a 100644
--- a/app/views/admin/pages/_form.html.haml
+++ b/app/views/admin/pages/_form.html.haml
@@ -1,3 +1,3 @@
 = semantic_form_for [:admin, page] do |f|
   = f.inputs :name, :title, :content
-  = f.buttons
\ No newline at end of file
+  = f.actions
diff --git a/app/views/admin/passwords/edit.html.haml b/app/views/admin/passwords/edit.html.haml
index 2016bb0..16e0370 100644
--- a/app/views/admin/passwords/edit.html.haml
+++ b/app/views/admin/passwords/edit.html.haml
@@ -8,7 +8,7 @@
     = f.input :password, :label => "New Password"
     = f.input :password_confirmation, :label => "Confirm Password"
 
-  = f.buttons do
+  = f.actions do
     = f.submit "Change my password"
 
-= render :partial => "devise/shared/links"
\ No newline at end of file
+= render :partial => "devise/shared/links"
diff --git a/app/views/admin/photos/_form.html.haml b/app/views/admin/photos/_form.html.haml
index e3f348c..ca54678 100644
--- a/app/views/admin/photos/_form.html.haml
+++ b/app/views/admin/photos/_form.html.haml
@@ -5,4 +5,4 @@
         = check_box_tag "photo[category_ids][]", photo_category.id, @photo.categories.include?(photo_category), :id => "photo_category_ids_#{photo_category.id}"
         = label_tag "photo_category_ids_#{photo_category.id}", photo_category.name
   = f.inputs :photo, :title, :description, :flickr_url, :featured, :enabled, :taken_at
-  = f.buttons
\ No newline at end of file
+  = f.actions
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
index b1166d9..d88cbfc 100644
--- a/app/views/admin/sessions/new.html.haml
+++ b/app/views/admin/sessions/new.html.haml
@@ -8,7 +8,7 @@
     - if devise_mapping.rememberable?
       = f.input :remember_me, :as => :boolean
   
-  = f.buttons do
+  = f.actions do
     = f.submit "Sign In"
 
-= render :partial => "devise/shared/links"
\ No newline at end of file
+= render :partial => "devise/shared/links"
diff --git a/app/views/admin/unlocks/new.html.haml b/app/views/admin/unlocks/new.html.haml
index 43256b7..53bef05 100644
--- a/app/views/admin/unlocks/new.html.haml
+++ b/app/views/admin/unlocks/new.html.haml
@@ -5,7 +5,7 @@
   = f.inputs do
     = f.input :email
 
-  = f.buttons do
+  = f.actions do
     = f.submit "Resend unlock instructions"
     
 = render :partial => "devise/shared/links"