diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f2370db..ac9b2d1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,8 +1,7 @@
 class UsersController < ApplicationController
-  load_and_authorize_resource
-
   def show
     @user = User.find_by_id(params[:id]) || current_user
+    authorize! :read, @user
     @orders = @user.orders.includes(:products).paginate(page: params[:page])
     @products = @user.products.select("products.*", "sum(order_items.count) as count").group(:product_id)
     @categories = @user.products.select("products.category", "sum(order_items.count) as count").group(:category)
@@ -10,10 +9,13 @@ class UsersController < ApplicationController
 
   def index
     @users = User.members
+    authorize! :read, @users
   end
 
   def destroy
-    User.find(params[:id]).destroy
+    @user = User.find(params[:id])
+    authorize! :destroy, @users
+    @user.destroy
     flash[:success] = "Succesfully removed user"
     redirect_to action: :index
   end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 409f28b..29403fa 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -8,8 +8,9 @@ class Ability
       can :schulden, :admins
     elsif user.koelkast?
       can :manage, Order
-    else
+    elsif user[:id]
       can :read, :all
+      can :update, User
     end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index a590ba1..f1be795 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,8 +38,6 @@ class User < ActiveRecord::Base
   belongs_to :dagschotel, class_name: 'Product'
 
   validates :nickname, presence: true, uniqueness: true
-  validates :name, presence: true
-  validates :last_name, presence: true
   validates_attachment :avatar, presence: true, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
 
   scope :members, -> { where koelkast: false }
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 420ca6b..2542006 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -27,6 +27,9 @@
         <li><%= mail_to "tab@zeus.ugent.be", "Send feedback" %></li>
         <% if user_signed_in? %>
           <% if can? :manage, :all %>
+            <li>
+            <%= link_to "Place order", orders_path %>
+            </li>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Products <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
diff --git a/app/views/products/_product.html.erb b/app/views/products/_product.html.erb
index 1a76d01..f220488 100644
--- a/app/views/products/_product.html.erb
+++ b/app/views/products/_product.html.erb
@@ -3,7 +3,7 @@
     <%= image_tag product.avatar %>
     <div class="caption">
       <h3><%= product.name %> - <%= euro(product.price) %> (<%= product.stock %>)</h3>
-      <% if current_user.admin? %>
+      <% if current_user && current_user.admin? %>
         <p>
           <%= link_to "Edit", edit_product_path(product), class: "btn btn-default" %>
           <%= link_to "Delete", product_path(product), method: :delete, class: "btn btn-danger", data: {confirm: 'Are you sure?'} %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 010a138..1f4e17f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -227,7 +227,7 @@ Devise.setup do |config|
   # config.navigational_formats = ['*/*', :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :get
+  config.sign_out_via = :delete
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
diff --git a/db/seeds.rb b/db/seeds.rb
index 28fc1d4..bea33b0 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,3 +6,70 @@
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 
+DEFAULT_PASSWORD = "password"
+
+products = [
+  {
+    name:     'Fanta',
+    price:    0.6,
+    category: 'beverages',
+    stock:    25,
+    avatar:   File.new('public/seeds/products/fanta.jpg', 'r')
+  },
+  {
+    name:     'Club Mate',
+    price:    1.2,
+    category: 'beverages',
+    stock:    25,
+    avatar:   File.new('public/seeds/products/club_mate.jpg', 'r')
+  },
+  {
+    name:     'Kinder Bueno',
+    price:    0.6,
+    category: 'food',
+    stock:    15,
+    avatar:   File.new('public/seeds/products/bueno.jpg', 'r')
+  }
+]
+
+products.each do |attr|
+  Product.create name: attr[:name], price: attr[:price], category: attr[:category], stock: attr[:stock], avatar: attr[:avatar]
+end
+
+users = [
+  {
+    nickname:   'admin',
+    name:       'A.',
+    last_name:  'Admin',
+    avatar:     File.new('public/seeds/users/admin.jpg', 'r'),
+    admin:      true
+  },
+  {
+    nickname:   'koelkast',
+    avatar:     File.new('public/seeds/users/admin.jpg', 'r'),
+    koelkast:   true
+  },
+  {
+    nickname:   'benji',
+    name:       'Benjamin',
+    last_name:  'Cousaert',
+    avatar:     File.new('public/seeds/users/benji.jpg', 'r'),
+    dagschotel: Product.first
+  },
+  {
+    nickname:   'don',
+    name:       'Lorin',
+    last_name:  'Werthen',
+    avatar:     File.new('public/seeds/users/don.jpg', 'r')
+  },
+  {
+    nickname:   'silox',
+    name:       'Tom',
+    last_name:  'Naessens',
+    avatar:     File.new('public/seeds/users/silox.jpg', 'r')
+  }
+]
+
+users.each do |attr|
+  User.create nickname: attr[:nickname], name: attr[:name], last_name: attr[:last_name], avatar: attr[:avatar], dagschotel: attr[:dagschotel], password: DEFAULT_PASSWORD, password_confirmation: DEFAULT_PASSWORD, admin: attr[:admin] || false, koelkast: attr[:koelkast] || false
+end
diff --git a/public/seeds/products/bueno.jpg b/public/seeds/products/bueno.jpg
new file mode 100644
index 0000000..99d1d5e
Binary files /dev/null and b/public/seeds/products/bueno.jpg differ
diff --git a/public/seeds/products/club_mate.jpg b/public/seeds/products/club_mate.jpg
new file mode 100644
index 0000000..36abe00
Binary files /dev/null and b/public/seeds/products/club_mate.jpg differ
diff --git a/public/seeds/products/fanta.jpg b/public/seeds/products/fanta.jpg
new file mode 100644
index 0000000..f4e6848
Binary files /dev/null and b/public/seeds/products/fanta.jpg differ
diff --git a/public/seeds/users/admin.jpg b/public/seeds/users/admin.jpg
new file mode 100644
index 0000000..363fb8f
Binary files /dev/null and b/public/seeds/users/admin.jpg differ
diff --git a/public/seeds/users/benji.jpg b/public/seeds/users/benji.jpg
new file mode 100644
index 0000000..1f26127
Binary files /dev/null and b/public/seeds/users/benji.jpg differ
diff --git a/public/seeds/users/don.jpg b/public/seeds/users/don.jpg
new file mode 100644
index 0000000..f5ca63c
Binary files /dev/null and b/public/seeds/users/don.jpg differ
diff --git a/public/seeds/users/silox.jpg b/public/seeds/users/silox.jpg
new file mode 100644
index 0000000..294f8d2
Binary files /dev/null and b/public/seeds/users/silox.jpg differ