diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 4f40d576..a8a0da2a 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -4,39 +4,67 @@
 
 {% block content %}
 
-    <div class="page-header">
-        <h1 class="text-center">Asset List</h1>
-    </div>
+<div class="page-header">
+  <h1 class="text-center">Asset List</h1>
+</div>
 
-    <form id="asset-filter-form" onsubmit=>
-        {% csrf_token %}
-        <div class="input-group">
-            <input type="q" name="q" placeholder="Search" class="form-control" value="{{searchName}}">
-            <label for="asset_id" class="sr-only">Asset ID</label>
-            <span class="input-group-btn"><button type="submit" class="btn">Search</button></span>
-        </div>
-    </form>
+<form id="asset-search-form">
+  {% csrf_token %}
+  <div class="input-group">
+    <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{searchName}}">
+    <label for="asset_id" class="sr-only">Asset ID/Description:</label>
+    <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
+  </div>
+</form>
 
-    <table class="table table-striped">
-        <thead>
-        <tr>
-            <th>Asset ID</th>
-            <th>Description</th>
-            <th>Category</th>
-            <th>Status</th>
-            <th>Quick Links</th>
-        </tr>
-        </thead>
-        <tbody id="asset_table_body">
-        {% include 'asset_list_table_body.html' %}
-        </tbody>
-    </table>
+<form class="form-inline" id="asset-filter-form">
+  {% csrf_token %}
+  <div class="form-group">
+    <label for="cat">Category:</label>
+    <select name="cat" class="form-control">
+          <option>None</option>
+          {% for name in categories %}
+          <option>
+            {{ name }}
+          </option>
+          {% endfor %}
+      </select>
+  </div>
+  <div class="form-group">
+    <label for="status">Status:</label>
+    <select name="status" class="form-control">
+    <option>None</option>
+            {% for name in statuses %}
+            <option>
+              {{ name }}
+            </option>
+            {% endfor %}
+    </select>
+  </div>
+  <!---TODO: Auto filter whenever an option is selected, instead of using a button --->
+  <button type="submit" class="btn btn-default">Filter</button>
+</form>
 
-    {% if is_paginated %}
-            <div class="text-center">
-                {% paginator %}
-            </div>
-    {% endif %}
+<table class="table">
+  <thead>
+    <tr>
+      <th>Asset ID</th>
+      <th>Description</th>
+      <th>Category</th>
+      <th>Status</th>
+      <th>Quick Links</th>
+    </tr>
+  </thead>
+  <tbody id="asset_table_body">
+    {% include 'partials/asset_list_table_body.html' %}
+  </tbody>
+</table>
+
+{% if is_paginated %}
+<div class="text-center">
+  {% paginator %}
+</div>
+{% endif %}
 
 {% endblock %}
 
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 6e6c4fb1..6c3de1e0 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -9,13 +9,13 @@
 <div class="page-header">
   <h1>
       {% if edit and object %}
-          Edit Asset: {{ object.asset_id }} {{ object.description }}
+          Edit Asset: {{ object.asset_id }} - {{ object.description }}
       {% elif duplicate %}
           Duplication of Asset: {{ previous_asset_id }}
       {% elif not object %}
           Create Asset
       {% else %}
-          Asset: {{ object.asset_id }} {{ object.description }}
+          Asset: {{ object.asset_id }} - {{ object.description }}
       {% endif %}
   </h1>
 </div>
diff --git a/assets/templates/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
similarity index 100%
rename from assets/templates/asset_list_table_body.html
rename to assets/templates/partials/asset_list_table_body.html
diff --git a/assets/views.py b/assets/views.py
index 59e0ed67..62402a95 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -20,18 +20,27 @@ class AssetList(LoginRequiredMixin, generic.ListView):
     ordering = ['-pk']
         
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
-        if len(q) >= 3:
-            return self.model.objects.filter(Q(asset_id__exact=q) | Q(description__icontains=q) | Q(comments__icontains=q))
-        elif q != "":
-            return self.model.objects.filter(Q(asset_id__exact=q))
+        #TODO Feedback to user when search fails
+        query = self.request.GET.get('query', "")
+        if len(query) >= 3:
+            return self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
+        elif query != "":
+            return self.model.objects.filter(Q(asset_id__exact=query))
         else:
-            return self.model.objects.all()
+            cat = self.request.GET.get('cat', "")
+            status = self.request.GET.get('status', "")
+            if cat != "None":
+                return self.model.objects.filter(category__name__exact=cat)
+            elif status != "None":
+                return self.model.objects.filter(status__name__exact=status)
+            else:
+                return self.model.objects.all()
     
     def get_context_data(self, **kwargs):
-        q = self.request.GET.get('q', "")
         context = super(AssetList, self).get_context_data(**kwargs)
-        context["searchName"] = q
+        context["search_name"] = self.request.GET.get('query', "")
+        context["categories"] = models.AssetCategory.objects.all()
+        context["statuses"] = models.AssetStatus.objects.all()
         return context;
 
 class AssetDetail(LoginRequiredMixin, generic.DetailView):