diff --git a/RIGS/templates/invoice_confirm_delete.html b/RIGS/templates/invoice_confirm_delete.html
index 4b575cb5..1fa00f13 100644
--- a/RIGS/templates/invoice_confirm_delete.html
+++ b/RIGS/templates/invoice_confirm_delete.html
@@ -1,35 +1,20 @@
 {% extends 'base_rigs.html' %}
 
-{% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}
+{% block title %}Delete Invoice {{ object.invoice.pk }}{% endblock %}
 
 {% block content %}
-    <div class="col-sm-offset-2 col-sm-8">
-        <div class="alert alert-danger" role="alert">
-            <h2>Delete invoice {{ object.pk }}</h2>
+<div class="alert alert-danger" role="alert">
+    <h2>Delete Invoice {{ object.pk }}</h2>
 
-            <p>Are you sure you wish to delete invoice {{ object.pk }}?</p>
+    <p>Are you sure you wish to delete invoice {{ object.pk }}?</p>
 
-            <p class="text-center"><strong>This action cannot be undone!</strong></p>
-
-            <div class="row">
-                <div class="col-sm-12">
-                    <form action="{{ action_link }}" method="post">{% csrf_token %}
-                        <input type="hidden" name="next" value="{% url 'invoice_list' %}"/>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <input type="submit" value="Yes" class="btn btn-danger col-sm-1"/>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default col-sm-1">No</a>
-                    </form>
-                </div>
-            </div>
-        </div>
+    <div class="text-right">
+        <form action="{{ action_link }}" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="next" value="{% url 'invoice_list' %}"/>
+            <input type="submit" value="Yes" class="btn btn-danger col-sm-1"/>
+            <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-success col-sm-1">No</a>
+        </form>
     </div>
-{% endblock %}
\ No newline at end of file
+</div>
+{% endblock %}
diff --git a/RIGS/templates/invoice_list.html b/RIGS/templates/invoice_list.html
index 87edd9be..6502951a 100644
--- a/RIGS/templates/invoice_list.html
+++ b/RIGS/templates/invoice_list.html
@@ -9,8 +9,8 @@
         <h2>{% block heading %}Invoices{% endblock %}</h2>
         {% block description %}{% endblock %}
         {% block search %}{% endblock %}
-        <div class="table-responsive col-sm-12">
-            <table class="table table-hover">
+        <div class="table-responsive">
+            <table class="table table-hover table-bordered table-sm">
                 <thead>
                     <tr>
                         <th scope="col">Invoice #</th>
@@ -51,9 +51,7 @@
                             {% endif %}
                         </td>
                         <td class="text-right">
-                            <a href="{% url 'invoice_detail' invoice.pk %}" class="btn btn-primary">
-                                <i class="fas fa-edit"></i>
-                            </a>
+                            <a href="{% url 'invoice_detail' invoice.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span></a>
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/RIGS/templates/invoice_list_archive.html b/RIGS/templates/invoice_list_archive.html
index 32585657..2ef92ab6 100644
--- a/RIGS/templates/invoice_list_archive.html
+++ b/RIGS/templates/invoice_list_archive.html
@@ -13,11 +13,10 @@ All Invoices
 {% endblock %}
 
 {% block search %}
-<div class="col-sm-3 col-sm-offset-9">
-	<form class="form form-horizontal col-sm-12">
+<div class="col-md-6">
+	<form class="form form-horizontal">
 	    <div class="form-group">
-	        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
-	               class="form-control"/>
+	        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}" class="form-control"/>
 	    </div>
 	</form>
 </div>