diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index ca977980..ded3e939 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -17,7 +17,7 @@
         </div>
     </form>
 
-    <table class="table">
+    <table class="table table-striped">
         <thead>
         <tr>
             <th>Asset ID</th>
@@ -33,7 +33,7 @@
     </table>
 
     {% if is_paginated %}
-            <div class="col-md-6 text-right">
+            <div class="text-center">
                 {% paginator %}
             </div>
     {% endif %}
diff --git a/assets/templates/helpers/render_field.html b/assets/templates/helpers/render_field.html
index 6397415d..e372f92c 100644
--- a/assets/templates/helpers/render_field.html
+++ b/assets/templates/helpers/render_field.html
@@ -1,15 +1,15 @@
 {% load widget_tweaks %}
 
-<div class="input-field col {{ width|default:'s12' }}">
-    {% if css %}
-    {% render_field  field|add_class:css %}
-    {% elif disable_if_filled and field.value %}
-    {% render_field  field|attr:'disabled' %}
-    {% elif css and disable_if_filled %}
-    {% render_field  field|add_class:css|attr:'disabled' %}
-    {% else %}
-    {{ field }}
-    {% endif %}
+<div class="form-group">
     <label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label>
+    {% if css %}
+    {% render_field field|add_class:'form-control' %}
+    {% elif disable_if_filled and field.value %}
+    {% render_field field|attr:'disabled'|add_class:'form-control' %}
+    {% elif css and disable_if_filled %}
+    {% render_field field|add_class:'form-control'|attr:'disabled' %}
+    {% else %}
+    {{ field|add_class:'form-control' }}
+    {% endif %}
     <span class="helper-text" data-error="{{ field.errors.text }}"></span>
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/templates/supplier_list.html b/assets/templates/supplier_list.html
index 5b37dadf..2affb7f8 100644
--- a/assets/templates/supplier_list.html
+++ b/assets/templates/supplier_list.html
@@ -1,29 +1,36 @@
 {% extends 'base_assets.html' %}
 {% block title %}List{% endblock %}
+{% load paginator from filters %}
 
 {% block content %}
 
-    <h4>Supplier List</h4>
+<div class="page-header">
+    <h1>Supplier List</h1>
+</div>
 
-    <table class="striped">
-        <thead>
-        <tr>
-            <th>Supplier</th>
-            <th>Quick Links</th>
-        </tr>
-        </thead>
-        <tbody id="asset_table_body">
-            {% for item in object_list %}
-            <tr>
-                <td>{{ item.name }}</td>
-                <td>
-                    <a href="{% url 'supplier_update' item.pk %}"><i class="material-icons">edit</i></a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Supplier</th>
+      <th>Quick Links</th>
+    </tr>
+  </thead>
+  <tbody id="asset_table_body">
+    {% for item in object_list %}
+    <tr>
+      <td>{{ item.name }}</td>
+      <td>
+        <a href="{% url 'supplier_update' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
 
-    {% include 'helpers/paginator.html' %}
+{% if is_paginated %}
+<div class="text-center">
+  {% paginator %}
+</div>
+{% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/assets/templates/supplier_update.html b/assets/templates/supplier_update.html
index 2f120369..dfc8cc54 100644
--- a/assets/templates/supplier_update.html
+++ b/assets/templates/supplier_update.html
@@ -3,22 +3,18 @@
 
 {% block content %}
 
-    <h4>
-        Supplier
+    <div class="page-header">
+        <h1>Supplier
         {% if object %}
-           Edit | {{ object.name }}
+           Edit: {{ object.name }}
         {% else %}
             Create
-        {% endif %}
-    </h4>
-
-    <div class="divider"></div>
-
+        {% endif %}</h1>
+    </div>
     <form method="post">
         {% csrf_token %}
-
             {{ form }}
 
-        <input type="submit" value="Save" class="btn">
+        <input type="submit" value="Save" class="btn btn-success">
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}