diff --git a/views/default.slim b/app/views/default.slim
similarity index 100%
rename from views/default.slim
rename to app/views/default.slim
diff --git a/views/error_403.slim b/app/views/error_403.slim
similarity index 100%
rename from views/error_403.slim
rename to app/views/error_403.slim
diff --git a/views/error_404.slim b/app/views/error_404.slim
similarity index 100%
rename from views/error_404.slim
rename to app/views/error_404.slim
diff --git a/views/form.slim b/app/views/form.slim
similarity index 100%
rename from views/form.slim
rename to app/views/form.slim
diff --git a/views/show.slim b/app/views/show.slim
similarity index 100%
rename from views/show.slim
rename to app/views/show.slim
diff --git a/lib/error_pages.rb b/lib/error_pages.rb
index 3decfb0..65d3df0 100644
--- a/lib/error_pages.rb
+++ b/lib/error_pages.rb
@@ -1,5 +1,5 @@
 class ErrorPages < Sinatra::Base
-  set :views, File.expand_path('../../views', __FILE__)
+  set :views, File.expand_path('../../app/views', __FILE__)
 
   not_found do
     status 404
diff --git a/pastemaster.rb b/pastemaster.rb
index d7ece28..5325acd 100644
--- a/pastemaster.rb
+++ b/pastemaster.rb
@@ -24,6 +24,7 @@ require 'lib/assets'
 class Pastemaster < Sinatra::Application
   set :server, 'unicorn'
   set :public_folder, 'public'
+  set :views, File.expand_path('../app/views', __FILE__)
 
   set :slim, pretty: true
 
@@ -46,7 +47,7 @@ class Pastemaster < Sinatra::Application
   end
 
   get '/:id/:key' do
-    @paste = Paste.find(params[:id])
+    @paste = Paste.find(params[:id].to_i)
     return not_found unless @paste
 
     begin