diff --git a/tubesync/sync/templates/sync/tasks.html b/tubesync/sync/templates/sync/tasks.html
index a074df85..7569fb6a 100644
--- a/tubesync/sync/templates/sync/tasks.html
+++ b/tubesync/sync/templates/sync/tasks.html
@@ -54,8 +54,8 @@
             <i class="fas fa-exclamation-triangle"></i> <strong>{{ task }}</strong>, attempted {{ task.attempts }} time{{ task.attempts|pluralize }}<br>
             Error: &quot;{{ task.error_message }}&quot;<br>
           </a>
-          <i class="fas fa-history"></i> Task will be retried at <strong>{{ task.run_at|date:'Y-m-d H:i:s' }}</strong>
-          <a href="{% url 'sync:run-task' pk=task.pk %}" class="error-text">
+          <i class="fas fa-history"></i> Task will be retried at <strong>{{ task.end_at|date:'Y-m-d H:i:s' }}</strong>
+          <a href="{% url 'sync:run-task' pk=task.task_id %}" class="error-text">
             <i class="fas fa-undo"></i>
           </a>
         </div>
@@ -80,12 +80,13 @@
         <div class="collection-item">
           <a href="{% url task.url pk=task.instance.pk %}">
             <i class="fas fa-hourglass-start"></i> <strong>{{ task }}</strong><br>
-            {% if task.instance.index_schedule and task.repeat > 0 %}Scheduled to run {{ task.instance.get_index_schedule_display|lower }}.<br>{% endif %}
-            <i class="far fa-clock"></i> Task will run {% if task.run_now %}<strong>immediately</strong>{% else %}at <strong>{{ task.run_at|date:'Y-m-d H:i:s' }}</strong>
+            {% if task.instance.is_active and 'once' not in task.verbose_name %}Scheduled to run {{ task.instance.get_index_schedule_display|lower }}.<br>{% endif %}
+            <i class="far fa-clock"></i> Task will run {% if task.run_now %}<strong>immediately</strong>{% else %}at <strong>{{ task.end_at|date:'Y-m-d H:i:s' }}</strong>
+          {% if '-' not in task.task_id %}
           </a>
-          <a href="{% url 'sync:run-task' pk=task.pk %}">
+          <a href="{% url 'sync:run-task' pk=task.task_id %}">
             <i class="far fa-play-circle"></i>
-          {% endif %}
+          {% endif %}{% endif %}
           </a>
         </div>
       {% empty %}
@@ -94,7 +95,7 @@
     </div>
   </div>
 </div>
-{% include 'pagination.html' with pagination=sources.paginator filter=source.pk %}
+{% include 'pagination.html' with filter=source.pk %}
 <div class="row">
   <div class="col s12">
     <h2>Completed</h2>