diff --git a/app/controllers/resources_controller.rb b/app/controllers/resources_controller.rb
index ad75e95..90c6d40 100755
--- a/app/controllers/resources_controller.rb
+++ b/app/controllers/resources_controller.rb
@@ -1,4 +1,13 @@
 class ResourcesController < ApplicationController
   load_and_authorize_resource
   before_filter :authenticate_user!
+
+  def destroy
+    @resource.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(request.env["HTTP_REFERER"]) }
+      format.json  { head :ok }
+    end
+  end
 end
diff --git a/app/models/resource.rb b/app/models/resource.rb
index d1d1646..98e5d97 100755
--- a/app/models/resource.rb
+++ b/app/models/resource.rb
@@ -1,7 +1,8 @@
 class Resource < ActiveRecord::Base
-  belongs_to :owner, :class_name => "ToolshareUser"
+  belongs_to :owner, :class_name => "ToolshareUser" #TODO: remove owner
+  belongs_to :user
   belongs_to :category, :class_name => "ResourceCategory"
-  has_attached_file :picture, 
+  has_attached_file :picture,  #TODO: move to local storage
                     :styles => { :medium => "300x300>",
 	                         :thumb => "100x100>",
 				 :tiny => "50x50>"},
@@ -9,4 +10,8 @@ class Resource < ActiveRecord::Base
                     :s3_credentials => Rails.root.join('config', 's3.yml'),
                     :path => ":attachment/:id/:style.:extension",
                     :bucket => 'Toolshare'
+
+  def category_name
+    self.category.name if self.category
+  end
 end
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 33de186..51cd7c4 100755
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -4,7 +4,7 @@
 
 <div class="payment_links <%= "payment-highlighted" if params[:flash] == "welcome_msg" %>">
 
-  <%= render '/statistics/index' %>
+  <%= render '/statistics/index' unless params[:flash] == "welcome_msg" %>
   <% if can? :read, resource.payments.first then %>
   <h3>Recorded Payments:</h3>
   <ul>
diff --git a/app/views/resources/_resource.html.erb b/app/views/resources/_resource.html.erb
new file mode 100644
index 0000000..553bb9c
--- /dev/null
+++ b/app/views/resources/_resource.html.erb
@@ -0,0 +1,9 @@
+<div class="col-sm-2">
+  <div class="thumbnail">
+    <%= link_to(resource) do %>
+      <%= image_tag(resource.picture.url(:thumb)) if resource.picture? %>
+      <strong><%=h resource.name %></strong>
+    <% end %>
+    <%= "Owned by "+resource.user.name if resource.user %>
+  </div>
+</div>
diff --git a/app/views/resources/index.html.erb b/app/views/resources/index.html.erb
index 00b8ab6..fc84f0b 100755
--- a/app/views/resources/index.html.erb
+++ b/app/views/resources/index.html.erb
@@ -1,38 +1,31 @@
 <h1>Resources</h1>
 
-<%= link_to 'New Resource', new_resource_path, :class => "btn" if can? :create, Resource %>
+<%= link_to 'Add Equipment', new_resource_path, :class => "btn" if can? :create, Resource %>
+
+<style>
+  .collapsible .thumbnail { height: 150px; }
+</style>
 
-<table class="lined-table">
-  <tr>
-    <th></th>
-    <th> <%= sort_link 'Owner', :owner_id %></th>
-    <th> <%= sort_link 'Category', :category_id %></th>
-    <th> <%= sort_link 'Name', :name %></th>
-    <th> <%= sort_link 'Serial', :serial %></th>
-    <th> <%= sort_link 'Status/Location', :status %></th>
-  </tr>
-  
 <% unless @resources.blank? %>
-  <% @resources.group_by(&:supercategory).each do |supercategory,resources| %>
-    <tr><th><%= supercategory %></th></tr>
-    <% resources.each do |resource| %>
-    <tr>
-      <td>
-        <%= link_to image_tag(resource.picture.url(:tiny)), resource.picture.url, :popup => ['index_image_preview', 'height=300,width=400'] if resource.picture? %>
-      </td>
-      <td>
-        <%=h resource.owner.name if resource.owner %>
-      <td><%=h resource.category.name unless resource.category.nil? %></td>
-      <td><%=h resource.name %></td>
-      <td><%=h resource.serial %></td>
-      <td><%=h resource.status %></td>
-      <td><%= link_to 'Edit', edit_resource_path(resource) if can? :update, resource %></td>
-      <td><%= link_to 'Destroy', resource, :confirm => 'Are you sure you want to delete this?', :method => :delete if can? :destroy, resource %></td>
-    </tr>
+  <div class="panel-group" id="accordion">
+    <% @resources.sort_by{|r| [r.category_name,r.name] }.group_by(&:category).each do |category,resources| %>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+            <%= category.name %>
+          </a>
+        </h4>
+      </div>
+      <div id="collapseOne" class="panel-collapse collapse in">
+        <div class="panel-body">
+        <%= render resources %>
+        </div>
+      </div>
+    </div>
     <% end %>
-  <% end %>
+  </div>
 <% end %>
-</table>
 
 <br />
 
diff --git a/db/migrate/20140209080523_add_user_id_to_resource.rb b/db/migrate/20140209080523_add_user_id_to_resource.rb
new file mode 100644
index 0000000..4b15e45
--- /dev/null
+++ b/db/migrate/20140209080523_add_user_id_to_resource.rb
@@ -0,0 +1,5 @@
+class AddUserIdToResource < ActiveRecord::Migration
+  def change
+    add_column :resources, :user_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 67edaf6..de89034 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140209072532) do
+ActiveRecord::Schema.define(:version => 20140209080523) do
 
   create_table "cards", :force => true do |t|
     t.string   "card_number"
@@ -140,6 +140,7 @@ ActiveRecord::Schema.define(:version => 20140209072532) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "estimated_value"
+    t.integer  "user_id"
   end
 
   create_table "settings", :force => true do |t|