diff --git a/RIGS/templates/index.html b/RIGS/templates/index.html
index 200dbd40..5480a5cf 100644
--- a/RIGS/templates/index.html
+++ b/RIGS/templates/index.html
@@ -25,6 +25,10 @@
                 {% if perms.assets.add_asset %}
                     <a class="list-group-item list-group-item-action" href="{% url 'asset_create' %}"><i class="fas fa-plus"></i> New Asset</a>
                 {% endif %}
+                <a class="list-group-item list-group-item-action" href="{% url 'supplier_list' %}"><i class="fas fa-parachute-box"></i> Supplier List </a>
+                {% if perms.assets.add_asset %}
+                    <a class="list-group-item list-group-item-action" href="{% url 'supplier_create' %}"><i class="fas fa-plus"></i> New Supplier</a>
+                {% endif %}
             </div>
             <div class="card-header">
                     <h4 class="list-group-item-heading">Quick Links</h4>
diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html
index 9f91fe98..7cc31478 100644
--- a/RIGS/templates/rigboard.html
+++ b/RIGS/templates/rigboard.html
@@ -6,7 +6,7 @@
     <div>
         <h1 class="bd-title">Rigboard</h1>
         {% if perms.RIGS.add_event %}
-        <a href="{% url 'event_create' %}" class="btn btn-outline-primary float-right my-3">New <i class="fas fa-plus"></i></a>
+        <a href="{% url 'event_create' %}" class="btn btn-success float-right my-3">New <i class="fas fa-plus"></i></a>
         {% endif %}
     </div>
     {% include 'event_table.html' %}
diff --git a/assets/migrations/0011_auto_20200317_2006.py b/assets/migrations/0011_auto_20200317_2006.py
new file mode 100644
index 00000000..94ec2154
--- /dev/null
+++ b/assets/migrations/0011_auto_20200317_2006.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.3 on 2020-03-17 20:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0010_auto_20200219_1444'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='supplier',
+            name='address',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='email',
+            field=models.EmailField(blank=True, max_length=254, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='notes',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='phone',
+            field=models.CharField(blank=True, max_length=15, null=True),
+        ),
+    ]
diff --git a/assets/models.py b/assets/models.py
index a6c767f1..4853695d 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -45,6 +45,11 @@ class Supplier(models.Model, RevisionMixin):
         ordering = ['name']
 
     name = models.CharField(max_length=80)
+    phone = models.CharField(max_length=15, blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
+    address = models.TextField(blank=True, null=True)
+
+    notes = models.TextField(blank=True, null=True)
 
     def get_absolute_url(self):
         return reverse('supplier_list')
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 6c04b56d..7bcefd45 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -20,14 +20,14 @@
 </div>
 
 <form id="asset-search-form" method="get" class="form my-2">
-  <div class="row py-2">
+  <div class="row my-2">
       <div class="input-group">
         {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
         <label for="query" class="sr-only">Asset ID/Description/Serial Number:</label>
         <span class="input-group-append"><button type="submit" class="btn btn-primary">Search</button></span>
       </div>
   </div>
-  <div class="row py-2 justify-content-end">
+  <div class="row my-2 justify-content-end">
       <div id="category-group" class="form-group px-2">
         <label for="category" class="sr-only">Category</label>
         {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
@@ -41,7 +41,7 @@
   </div>
 </form>
 
-<a href="{% url 'asset_create' %}" class="btn btn-outline-primary float-right my-3">New <i class="fas fa-plus"></i></a>
+<a href="{% url 'asset_create' %}" class="btn btn-success float-right my-3">New <i class="fas fa-plus"></i></a>
 
 <table class="table">
   <thead>
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index f0f382b5..4de27ff7 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -6,10 +6,10 @@
         <td class="assetStatus" style="vertical-align: middle;">{{ item.status }}</td>
         <td class="hidden-xs">
             <div class="btn-group" role="group">
-                <a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
+                <a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye"></i> View</a>
                 {% if perms.assets.change_asset %}
-                <a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-                <a type="button" class="btn btn-secondary btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+                <a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="fas fa-edit"></i> Edit</a>
+                <a type="button" class="btn btn-secondary btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone"></i> Duplicate</a>
                 {% endif %}
             </div>
         </td>
diff --git a/assets/templates/supplier_update.html b/assets/templates/supplier_update.html
index af50c0eb..739dbbac 100644
--- a/assets/templates/supplier_update.html
+++ b/assets/templates/supplier_update.html
@@ -1,8 +1,9 @@
 {% extends 'base_assets.html' %}
-{% block title %}Edit{% endblock %}
+{% load widget_tweaks %}
+
+{% block title %}Edit Supplier{% endblock %}
 
 {% block content %}
-
     <div class="page-header">
         <h1>Supplier
         {% if object %}
@@ -11,10 +12,47 @@
             Create
         {% endif %}</h1>
     </div>
-    <form method="post">
+    <form method="POST">
         {% csrf_token %}
         {% include 'form_errors.html' %}
-        {{ form }}
-        <input type="submit" value="Save" class="btn btn-success">
+        <div class="form-group">
+            <label for="{{ form.name.id_for_label }}" class="col-sm-2 control-label">Name</label>
+            <div class="col-sm-10">
+                {% render_field form.name|add_class:'form-control' value=object.name %}
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="{{ form.phone.id_for_label }}"
+                   class="col-sm-2 control-label">{{ form.phone.label }}</label>
+            <div class="col-sm-10">
+                {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %}
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="{{ form.email.id_for_label }}"
+                   class="col-sm-2 control-label">{{ form.email.label }}</label>
+            <div class="col-sm-10">
+                {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %}
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="{{ form.address.id_for_label }}"
+                   class="col-sm-2 control-label">{{ form.address.label }}</label>
+
+            <div class="col-sm-10">
+                {% render_field form.address class+="form-control" placeholder=form.address.label %}
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="{{ form.notes.id_for_label }}"
+                   class="col-sm-2 control-label">{{ form.notes.label }}</label>
+
+            <div class="col-sm-10">
+                {% render_field form.notes class+="form-control" placeholder=form.notes.label %}
+            </div>
+        </div>
+        <div class="form-group">
+            <button type="submit" class="btn btn-success">Save</button>
+        </div>
     </form>
 {% endblock %}
diff --git a/RIGS/templates/partials/generic_list.html b/templates/partials/generic_list.html
similarity index 100%
rename from RIGS/templates/partials/generic_list.html
rename to templates/partials/generic_list.html
diff --git a/RIGS/templates/partials/last_edited.html b/templates/partials/last_edited.html
similarity index 100%
rename from RIGS/templates/partials/last_edited.html
rename to templates/partials/last_edited.html