diff --git a/kontor-api/src/templates/comic/comic_detail.html b/kontor-api/src/templates/comic/comic_detail.html
index c30c31c..aa004fc 100644
--- a/kontor-api/src/templates/comic/comic_detail.html
+++ b/kontor-api/src/templates/comic/comic_detail.html
@@ -71,5 +71,12 @@
         </tbody>
     </table>
   </div>
+  <div class="row">
+    <div>
+      <a href="/comic/comics" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Back to list</a>
+      <a href="/comic/comic/edit/{{comic.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a>
+      <a href="/comic/comic/delete/{{comic.id}}" class="btn btn-outline-danger btn-sm active" role="button" aria-pressed="true">Delete</a>
+    </div>
+  </div>
 </div>
 {% endblock %}
diff --git a/kontor-api/src/templates/comic/comics.html b/kontor-api/src/templates/comic/comics.html
index 91b6513..df98d07 100644
--- a/kontor-api/src/templates/comic/comics.html
+++ b/kontor-api/src/templates/comic/comics.html
@@ -9,23 +9,32 @@
     {% include "components/alerts.html" %}
   {% endwith %}
   <div class="container">
-  <div class="row">
-    <div class="col">
-      <h1 class="display-5">Find Jobs..</h1>
+    <div class="row">
+      <div class="col">
+        <h1 class="display-5">Comics..</h1>
+      </div>
+    </div>
+    <div class="row">
+      <table class="table table-hover">
+        <thead><tr>
+          <th scope="col">Title</th>
+          <th scope="col">Publisher</th>
+          <th scope="col">Completed</th>
+          <th colspan="2">Actions</th>
+        </tr></thead>
+        <tbody>
+        {% for comic in comics %}
+          <tr>
+            <th scope="row"><a href="/comic/comics/{{comic.id}}">{{comic.title}}</a></th>
+            <td><a href="/comic/publishers/{{comic.publisher.id}}">{{comic.publisher.name}}</a></td>
+            <td>{% with check=comic.completed %}{% include "components/check.html" %}{% endwith %}</td>
+            <td><a href="/comic/comics/edit/{{comic.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a></td>
+            <td><a href="/comic/comics/delete/{{comic.id}}" class="btn btn-outline-danger btn-sm active" role="button" aria-pressed="true">Delete</a></td>
+         </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+      <a href="/comic/comic/add" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Add Comic</a>
     </div>
   </div>
-  <div class="row">
-      {% for comic in comics %}
-        <div class="col-lg-4 col-md-3 col-sm-10 mr-auto">
-          {% with obj=comic %}
-      		{% include "components/comic_cards.html" %}
-    	  {% endwith %}
-          {% if loop.index %3 %}
-            </div>
-          {% else %}
-            </div></div><br><div class="row">
-          {% endif %}
-      {% endfor %}
-  </div>
-</div>
 {% endblock %}
diff --git a/kontor-api/src/templates/comic/worktype_detail.html b/kontor-api/src/templates/comic/worktype_detail.html
index 1c17823..178d65a 100644
--- a/kontor-api/src/templates/comic/worktype_detail.html
+++ b/kontor-api/src/templates/comic/worktype_detail.html
@@ -54,18 +54,7 @@
       <a href="/comic/worktypes" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Back to list</a>
       <a href="/comic/worktype/edit/{{worktype.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a>
       <a href="/comic/worktype/delete/{{worktype.id}}" class="btn btn-outline-danger btn-sm active" role="button" aria-pressed="true">Delete</a>
+    </div>
   </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-<script type="text/javascript">
-    function delete_job(id){
-        fetch('/comics/worktypes/'+id+'/delete/'+id,{
-            method:'DELETE',})
-        .then(response => response.json())
-        .then(document.getElementById('result').innerHTML = "Refreshing...")
-        .then(data => document.getElementById('result').innerHTML = data.detail);
-    }
-</script>
-{% endblock %}
diff --git a/kontor-api/src/templates/comic/worktype_edit.html b/kontor-api/src/templates/comic/worktype_edit.html
index 0055747..d5d806b 100644
--- a/kontor-api/src/templates/comic/worktype_edit.html
+++ b/kontor-api/src/templates/comic/worktype_edit.html
@@ -2,7 +2,7 @@
 
 
 {% block title %}
-  <title>Add a Video Link</title>
+  <title>Edit WorkType</title>
 {% endblock %}
 
 {% block content %}