diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 88e892afc80f2f05cb1376f8ef6484a2a2a1dc2a..9556bd8af823d4212941c0078c96138d537549cd 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -126,6 +126,13 @@ class Task(models.Model):
             except:
                 return None
 
+    @property
+    def has_quality_remarks(self):
+        try:
+            return self.remarks['quality']
+        except:
+            return None
+
     @property
     def quality_as_list(self):
         try:
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
index 01be4de30dbfeb43a0ce38af3bbf06dba9e11ed7..0485f26a8fca50c9da59b1d01d0052fa5a98341f 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
@@ -44,7 +44,24 @@
 
 
                 <td>{{ task.quality|default_if_none:"-" }}</td>
+
                 <td>
+                    {% if task.has_quality_remarks %}
+                        <a class="open-modal btn btn-primary btn-sm"
+                               href="{% url 'task-quality' task.id my_tasks.number %}"
+                               data-popup-url="{% url 'task-quality' task.id my_tasks.number %}">
+                            <i class="fas fa-pen-alt"></i>
+                        </a>&nbsp;
+                    {% else %}
+                        <a class="open-modal btn btn-secondary btn-sm"
+                               href="{% url 'task-quality' task.id my_tasks.number %}"
+                               data-popup-url="{% url 'task-quality' task.id my_tasks.number %}">
+                            <i class="fas fa-pen-alt"></i>
+                        </a>&nbsp;
+                    {% endif %}
+                </td>
+                <td>
+
                     <a href="{% url 'task-validate-view' task.pk 'poor' 'validated' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-check"></i> P</a>
                     <a href="{% url 'task-validate-view' task.pk 'moderate' 'validated' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-check"></i> M</a>
                     <a href="{% url 'task-validate-view' task.pk 'good' 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-check"></i> G</a>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
index e6911c18081cebeddeff56897b42b10d9c8fe8e5..88d6dc4743303e097b2c8b5718106d30b3bca970 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
@@ -25,6 +25,7 @@
     <th>Sensitivity</th>
     <th>Conditions</th>
     <th>Plots</th>
-    <th>Current Q</th>
-    <th>Choose</th>
+    <th>Quality</th>
+    <th>Edit</th>
+    <th>Poor/Moderate/Good</th>
 </tr>
\ No newline at end of file