diff --git a/atdb/atdb/static/taskdatabase/ldvlogo_small.png b/atdb/atdb/static/taskdatabase/ldvlogo_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d6c9bd9d35a1c65808723b3e34dbfa6989f2e2
Binary files /dev/null and b/atdb/atdb/static/taskdatabase/ldvlogo_small.png differ
diff --git a/atdb/taskdatabase/static/taskdatabase/ldvlogo_small.png b/atdb/taskdatabase/static/taskdatabase/ldvlogo_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..14989c31e2a47e13fb4d083ad33fd105c35d3c9f
Binary files /dev/null and b/atdb/taskdatabase/static/taskdatabase/ldvlogo_small.png differ
diff --git a/atdb/taskdatabase/templates/tables2/base.html b/atdb/taskdatabase/templates/tables2/base.html
index 2c7e0811b958a9be37548054f6be5cb1ffd29d96..9094468fe944d5d83a242acbd4b3daf0a19fddbf 100644
--- a/atdb/taskdatabase/templates/tables2/base.html
+++ b/atdb/taskdatabase/templates/tables2/base.html
@@ -32,16 +32,20 @@
<body>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
-
+ <ul class="nav navbar-nav">
<!-- Header -->
- <div class="navbar-header">
- <a class="navbar-brand mb-0 h1">
-
- <img src="{% static 'taskdatabase/ldvlogo.png' %}" height="90" alt="">
- </a>
- </div>
+ <li><a class="navbar-brand" href="{% url 'index' %}">
+ <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="30" alt="">
+ ATDB-LDV</a>
+ </li>
+ <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
+ <li><a class="nav-link" href="{% url 'tables2' %}">Alternative</a></li>
+ <li><a class="nav-link" href="https://git.astron.nl/astron-sdc/atdb-ldv/-/raw/master/atdb/docs/ATDB-LDV%20Workflow%20Diagram.png">State Diagram</a></li>
+
+ </ul>
</div>
{% include 'taskdatabase/search.html' %}
+
</nav>
<!-- to add blocks of code -->
diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html
index 913f2c681584b166466ec4bea3f8144141bd0a2c..f9b07a0589afdd6589000aa43b85ee60735d3f92 100644
--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -31,18 +31,20 @@
</head>
<body onload="readFromLocalStorage('search_box')">
+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
-
+ <ul class="nav navbar-nav">
<!-- Header -->
- <div class="navbar-header">
- <a class="navbar-brand mb-0 h1">
-
- <img src="{% static 'taskdatabase/ldvlogo.png' %}" height="90" alt="">
-
- </a>
- </div>
-
+ <li><a class="navbar-brand" href="{% url 'index' %}">
+ <img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="30" alt="">
+ ATDB-LDV</a>
+ </li>
+ <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
+ <li><a class="nav-link" href="{% url 'tables2' %}">Alternative</a></li>
+ <li><a class="nav-link" href="https://git.astron.nl/astron-sdc/atdb-ldv/-/raw/master/atdb/docs/ATDB-LDV%20Workflow%20Diagram.png">State Diagram</a></li>
+
+ </ul>
</div>
{% include 'taskdatabase/search.html' %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html b/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html
index 2207c0ae0442d9e03ef9ffc367be477a3011bad0..ad46ef746bbc00378688242584c74b3499233ab8 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html
@@ -1,21 +1,26 @@
-<table>
-<tr>
- <h5>Click to Filter<h5>
- <td>
- <a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button">ALL</a>
- <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
- <a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button">staging</a>
- <a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-primary btn-sm" role="button">staged</a>
- <a href="{% url 'task-set-filter' 'processing' %}" class="btn btn-secondary btn-sm" role="button">processing</a>
- <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-success btn-sm" role="button">processed</a>
- <a href="{% url 'task-set-filter' 'validated' %}" class="btn btn-primary btn-sm" role="button">validated</a>
- <a href="{% url 'task-set-filter' 'scrubbing' %}" class="btn btn-secondary btn-sm" role="button">scrubbing</a>
- <a href="{% url 'task-set-filter' 'scrubbed' %}" class="btn btn-primary btn-sm" role="button">scrubbed</a>
- <a href="{% url 'task-set-filter' 'archiving' %}" class="btn btn-secondary btn-sm" role="button">archiving</a>
- <a href="{% url 'task-set-filter' 'archived' %}" class="btn btn-primary btn-sm" role="button">archived</a>
- <a href="{% url 'task-set-filter' 'finished' %}" class="btn btn-primary btn-sm" role="button">finished</a>
- <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-danger btn-sm" role="button">failed</a>
+<div class="card">
+ <div class="card-body">
+ <table>
+ <tr><td>Click to Filter</td></tr>
+ <tr>
- </td>
-</tr>
-</table>
\ No newline at end of file
+ <td>
+ <a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button">ALL</a>
+ <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
+ <a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button">staging</a>
+ <a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-primary btn-sm" role="button">staged</a>
+ <a href="{% url 'task-set-filter' 'processing' %}" class="btn btn-secondary btn-sm" role="button">processing</a>
+ <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-success btn-sm" role="button">processed</a>
+ <a href="{% url 'task-set-filter' 'validated' %}" class="btn btn-primary btn-sm" role="button">validated</a>
+ <a href="{% url 'task-set-filter' 'scrubbing' %}" class="btn btn-secondary btn-sm" role="button">scrubbing</a>
+ <a href="{% url 'task-set-filter' 'scrubbed' %}" class="btn btn-primary btn-sm" role="button">scrubbed</a>
+ <a href="{% url 'task-set-filter' 'archiving' %}" class="btn btn-secondary btn-sm" role="button">archiving</a>
+ <a href="{% url 'task-set-filter' 'archived' %}" class="btn btn-primary btn-sm" role="button">archived</a>
+ <a href="{% url 'task-set-filter' 'finished' %}" class="btn btn-primary btn-sm" role="button">finished</a>
+ <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-danger btn-sm" role="button">failed</a>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 7e4b758bde910ffd0c19df7e784417b5d223eca4..55db7d8889ece83f57884bb90dfc83da25145d35 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -21,7 +21,7 @@
<thead>
<tr>
<th width="5%">ID</th>
- <th>Priority</th>
+ <th width="9%">Priority</th>
<th>Hold</th>
<th>Status</th>
<th>Project</th>