diff --git a/kontor-api/src/templates/components/artist_cards.html b/kontor-api/src/templates/comic/artist_cards.html
similarity index 100%
rename from kontor-api/src/templates/components/artist_cards.html
rename to kontor-api/src/templates/comic/artist_cards.html
diff --git a/kontor-api/src/templates/comic/artists.html b/kontor-api/src/templates/comic/artists.html
index 466364a..daa9e10 100644
--- a/kontor-api/src/templates/comic/artists.html
+++ b/kontor-api/src/templates/comic/artists.html
@@ -18,7 +18,7 @@
       {% for artist in artists %}
         <div class="col-lg-4 col-md-3 col-sm-10 mr-auto">
           {% with obj=artist %}
-      		{% include "components/artist_cards.html" %}
+      		{% include "comic/artist_cards.html" %}
     	    {% endwith %}
 
           {% if loop.index %3 %}
diff --git a/kontor-api/src/templates/components/comic_cards.html b/kontor-api/src/templates/comic/comic_cards.html
similarity index 100%
rename from kontor-api/src/templates/components/comic_cards.html
rename to kontor-api/src/templates/comic/comic_cards.html
diff --git a/kontor-api/src/templates/components/publisher_cards.html b/kontor-api/src/templates/comic/publisher_cards.html
similarity index 100%
rename from kontor-api/src/templates/components/publisher_cards.html
rename to kontor-api/src/templates/comic/publisher_cards.html
diff --git a/kontor-api/src/templates/comic/publishers.html b/kontor-api/src/templates/comic/publishers.html
index 3eaedc8..78b2e07 100644
--- a/kontor-api/src/templates/comic/publishers.html
+++ b/kontor-api/src/templates/comic/publishers.html
@@ -18,7 +18,7 @@
       {% for publisher in publishers %}
         <div class="col-lg-4 col-md-3 col-sm-10 mr-auto">
           {% with obj=publisher %}
-      		{% include "components/publisher_cards.html" %}
+      		{% include "comic/publisher_cards.html" %}
     	  {% endwith %}
           {% if loop.index %3 %}
             </div>
diff --git a/kontor-api/src/templates/components/actor_cards.html b/kontor-api/src/templates/media/actor_cards.html
similarity index 100%
rename from kontor-api/src/templates/components/actor_cards.html
rename to kontor-api/src/templates/media/actor_cards.html
diff --git a/kontor-api/src/templates/media/actor_detail.html b/kontor-api/src/templates/media/actor_detail.html
index f163f73..603c1ff 100644
--- a/kontor-api/src/templates/media/actor_detail.html
+++ b/kontor-api/src/templates/media/actor_detail.html
@@ -41,5 +41,12 @@
         </tbody>
     </table>
   </div>
+  <div class="row">
+    <div>
+      <a href="/media/actors" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Back to list</a>
+      <a href="/media/actor/edit/{{actor.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a>
+      <a href="/media/actor/delete/{{actor.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/media/actors.html b/kontor-api/src/templates/media/actors.html
index 836d614..251903e 100644
--- a/kontor-api/src/templates/media/actors.html
+++ b/kontor-api/src/templates/media/actors.html
@@ -18,7 +18,7 @@
       {% for actor in actors %}
         <div class="col-lg-4 col-md-3 col-sm-10 mr-auto">
           {% with obj=actor %}
-      		{% include "components/actor_cards.html" %}
+      		{% include "media/actor_cards.html" %}
     	  {% endwith %}
 
           {% if loop.index %3 %}
diff --git a/kontor-api/src/templates/media/file_detail.html b/kontor-api/src/templates/media/file_detail.html
index 186444b..085ff97 100644
--- a/kontor-api/src/templates/media/file_detail.html
+++ b/kontor-api/src/templates/media/file_detail.html
@@ -61,5 +61,12 @@
         </tbody>
     </table>
   </div>
+  <div class="row">
+    <div>
+      <a href="/media/files" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Back to list</a>
+      <a href="/media/file/edit/{{mediafile.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a>
+      <a href="/media/file/delete/{{mediafile.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/media/files.html b/kontor-api/src/templates/media/files.html
index 3fb77a8..1b59500 100644
--- a/kontor-api/src/templates/media/files.html
+++ b/kontor-api/src/templates/media/files.html
@@ -9,21 +9,31 @@
     {% include "components/alerts.html" %}
   {% endwith %}
   <div class="container">
-    <table class="table table-hover">
-      <thead><tr>
-        <th scope="col">Titel</th>
-        <th scope="col">URL</th>
-        <th scope="col">Cloudlink</th>
-      </tr></thead>
-      <tbody>
-          {%  for mediafile in mediafiles %}
-         <tr>
-           <th scope="row"><a href="/media/files/{{mediafile.id}}">{{mediafile.title}}</a></th>
-           <td>{{mediafile.url}}</td>
-           <td>{{mediafile.cloud_link}}</td>
-         </tr>
+    <div class="row">
+      <form class="d-flex" action="/media/files/">
+        <input class="form-control me-2" name="query" id="autocomplete" type="search" placeholder="Search" aria-label="Search">
+        Review<input type="checkbox" name="review" aria-label="Review">
+        Download<input type="checkbox" name="download" aria-label="Download">
+        <button class="btn btn-outline-success" type="submit">Search</button>
+      </form>
+    </div>
+    <div class="row">
+      <table class="table table-hover">
+        <thead><tr>
+          <th scope="col">Titel</th>
+          <th scope="col">Review</th>
+          <th scope="col">Download</th>
+        </tr></thead>
+        <tbody>
+          {% for mediafile in mediafiles %}
+          <tr>
+            <th scope="row"><a href="/media/files/{{mediafile.id}}">{{mediafile.title}}</a></th>
+            <td>{% with check=mediafile.review %}{% include "components/check.html" %}{% endwith %}</td>
+            <td>{% with check=mediafile.should_download %}{% include "components/check.html" %}{% endwith %}</td>
+          </tr>
           {% endfor %}
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
   </div>
 {% endblock %}
diff --git a/kontor-api/src/templates/media/videos.html b/kontor-api/src/templates/media/videos.html
index c8a029a..e66d358 100644
--- a/kontor-api/src/templates/media/videos.html
+++ b/kontor-api/src/templates/media/videos.html
@@ -12,15 +12,15 @@
     <table class="table table-hover">
       <thead><tr>
         <th scope="col">Titel</th>
-        <th scope="col">URL</th>
-        <th scope="col">Cloudlink</th>
+        <th scope="col">Review</th>
+        <th scope="col">Download</th>
       </tr></thead>
       <tbody>
         {%  for mediavideo in mediavideos %}
         <tr>
            <th scope="row"><a href="/media/videos/{{mediavideo.id}}">{{mediavideo.title}}</a></th>
-           <td>{{mediavideo.url}}</td>
-           <td>{{mediavideo.cloud_link}}</td>
+           <td>{% with check=mediavideo.review %}{% include "components/check.html" %}{% endwith %}</td>
+           <td>{% with check=mediavideo.should_download %}{% include "components/check.html" %}{% endwith %}</td>
         </tr>
         {% endfor %}
       </tbody>
diff --git a/kontor-api/src/webapps/media/route_media.py b/kontor-api/src/webapps/media/route_media.py
index 50f0762..3cacf3a 100644
--- a/kontor-api/src/webapps/media/route_media.py
+++ b/kontor-api/src/webapps/media/route_media.py
@@ -3,6 +3,7 @@ from typing import AnyStr
 from fastapi import APIRouter, Request
 from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
+from sqlalchemy import or_
 
 from src.apis.utils import SessionDep
 from src.apis.version1.admin import get_current_user_from_token
@@ -14,13 +15,29 @@ router = APIRouter(include_in_schema=False, prefix="/media")
 
 @router.get("/files")
 def get_mediafiles(db: SessionDep, request: Request, msg: str = None):
-    mediafiles = db.query(MediaFile).all()
+    params = request.query_params
+    query = params.get("query")
+    filter = {}
+    review = params.get('review') == "on"
+    if review:
+        filter['review'] = True
+    download = params.get("download") == "on"
+    if download:
+        filter['should_download'] = True
+    if query is not None and len(query) > 0:
+        filter['url'] = query
+    if len(filter) > 0:
+        if "url" in filter:
+            mediafiles  = db.query(MediaFile).filter(or_(MediaFile.title.ilike(f'%{query}%'), MediaFile.url.ilike(f"%{query}%")))
+        else:
+            mediafiles = db.query(MediaFile).filter_by(**filter).all()
+    else:
+        mediafiles = db.query(MediaFile).all()
     try:
         token = request.cookies.get("access_token")
         scheme, param = get_authorization_scheme_param(token)  # scheme will hold "Bearer" and param will hold actual token value
         current_user: Profile = get_current_user_from_token(token=param, db=db)
-        return templates.TemplateResponse("media/files.html",
-                                          {"request": request, "msg": msg, "mediafiles": mediafiles})
+        return templates.TemplateResponse("media/files.html", {"request": request, "msg": msg, "mediafiles": mediafiles})
     except Exception as e:
         print(e)
         msg = "Nicht berechtigt!!"