diff --git a/gui/static/w3style.css b/gui/static/w3style.css
index 6a98ba3b..5cc63288 100644
--- a/gui/static/w3style.css
+++ b/gui/static/w3style.css
@@ -34,7 +34,7 @@ table {border-radius: 10px} table th{background-color: #f0f0f5;} table tbody tr
th{position:sticky;overflow: hidden;top:0px;z-index:10}tr:first-child th:first-child{border-radius: 10px 0 0 0}tr:first-child th:last-child{border-radius: 0 10px 0 0}tr:last-child td:first-child{border-radius: 0 0 0 10px}tr:last-child td:last-child{border-radius: 0 0 10px 0}
.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
.w3-table,.w3-table-all{border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
+.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc !important}.w3-centered tr th,.w3-centered tr td{text-align:center}
.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
diff --git a/gui/templates/home.html b/gui/templates/home.html
index 8e876126..5b4ad783 100644
--- a/gui/templates/home.html
+++ b/gui/templates/home.html
@@ -335,7 +335,7 @@
-{% include 'rebalances_table.html' with count=10 load_count=10 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=local_settings.3.value count=10 load_count=10 title='Rebalance Requests' %}
diff --git a/gui/templates/rebalances.html b/gui/templates/rebalances.html
index f7ff2003..e41db2e2 100644
--- a/gui/templates/rebalances.html
+++ b/gui/templates/rebalances.html
@@ -1,8 +1,8 @@
{% extends "base.html" %}
{% block title %} {{ block.super }} - Rebalances{% endblock %}
{% block content %}
-{% include 'rebalances_table.html' with count=20 status=1 load_count=20 title='Rebalance Requests' %}
-{% include 'rebalances_table.html' with count=20 status=0 load_count=20 title='Rebalance Requests' %}
-{% include 'rebalances_table.html' with count=20 status=2 load_count=20 title='Rebalance Requests' %}
-{% include 'rebalances_table.html' with count=50 load_count=50 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=target_time count=20 status=1 load_count=20 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=target_time count=20 status=2 load_count=20 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=target_time count=20 status=0 load_count=20 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=target_time count=50 load_count=50 title='Rebalance Requests' %}
{% endblock %}
diff --git a/gui/templates/rebalances_table.html b/gui/templates/rebalances_table.html
index 1e5c3614..9456fbae 100644
--- a/gui/templates/rebalances_table.html
+++ b/gui/templates/rebalances_table.html
@@ -1,115 +1,144 @@
{% load humanize %}
-
{% if status == 2 %}Successful{% elif status == 0 %}Pending{% elif status == 1 %}In-Flight{% else %}Last{% endif %} {{title}}
-
-
- Requested |
- Start |
- Stop |
- Scheduled for |
- Elapsed |
- Value |
- Fee Limit |
- Target PPM |
- Fees Paid |
- Last Hop |
- Status |
- Hash |
- Action |
+ {% if status == 2 %}Successful{% elif status == 0 %}Pending{% elif status == 1 %}In-Flight{% else %}Last{% endif %} {{title}}
+
+
+ Requested |
+ Start |
+ Stop |
+ Scheduled for |
+ Elapsed |
+ Value |
+ Fee Limit |
+ Target PPM |
+ Fees Paid |
+ Last Hop |
+ Status |
+ Hash |
+ Action |
+
+
+
+
+
+
+ Load More
+ |
-
-
-
-
-
- Load More
- |
-
-
-
-
-
+ }
+
\ No newline at end of file
diff --git a/gui/templates/rebalancing.html b/gui/templates/rebalancing.html
index dc981b72..51b73aa1 100644
--- a/gui/templates/rebalancing.html
+++ b/gui/templates/rebalancing.html
@@ -185,6 +185,6 @@ Manual Rebalance R
})
}
-{% include 'rebalances_table.html' with count=20 load_count=10 title='Rebalance Requests' %}
+{% include 'rebalances_table.html' with target_time=local_settings.3.value count=20 load_count=10 title='Rebalance Requests' %}
{% include 'local_settings.html' with settings=local_settings title='Auto-Rebalancer' %}
{% endblock %}
diff --git a/gui/views.py b/gui/views.py
index 4d4c545e..ca0e7359 100644
--- a/gui/views.py
+++ b/gui/views.py
@@ -1175,7 +1175,7 @@ def invoices(request):
def rebalances(request):
if request.method == 'GET':
try:
- return render(request, 'rebalances.html')
+ return render(request, 'rebalances.html', {'target_time': LocalSettings.objects.get(key='AR-Time').value})
except Exception as e:
try:
error = str(e.code())