diff --git a/app.py b/app.py
index f1c4644..052a814 100644
--- a/app.py
+++ b/app.py
@@ -1671,10 +1671,9 @@ def list_media_view(request):
     # Filter based on user permissions
     user_role = get_user_or_agent_namespace_role(request)
     if user_role in ["owner", "editor"]:
-        # Owners and editors can see all media except unlisted
+        # Owners and editors can see all media including unlisted
         media_items = (
-            query.filter(Media.visibility != "unlisted")
-            .order_by(Media.upload_date.desc())
+            query.order_by(Media.upload_date.desc())
             .all()
         )
     else:
diff --git a/templates/upload_media.html.j2 b/templates/upload_media.html.j2
index d25a7f0..456457c 100644
--- a/templates/upload_media.html.j2
+++ b/templates/upload_media.html.j2
@@ -14,22 +14,6 @@
     <label for="title">Title (optional):</label>
     <input type="text" name="title"><br><br>
 
-    <fieldset>
-        <legend>Visibility</legend>
-        <label>
-            <input type="radio" name="visibility" value="public" checked>
-            Public - Visible in listings and accessible to all
-        </label><br>
-        <label>
-            <input type="radio" name="visibility" value="private">
-            Private - Only accessible to namespace members
-        </label><br>
-        <label>
-            <input type="radio" name="visibility" value="unlisted">
-            Unlisted - Accessible via direct link but hidden from listings
-        </label>
-    </fieldset><br>
-
     <details>
         <summary>Scheduled Actions (Optional)</summary>
         <fieldset>
@@ -47,6 +31,22 @@
         </fieldset>
     </details>
 
+    <fieldset>
+        <legend>Visibility</legend>
+        <label>
+            <input type="radio" name="visibility" value="public" checked>
+            Public - Visible in listings and accessible to all
+        </label><br>
+        <label>
+            <input type="radio" name="visibility" value="private">
+            Private - Only accessible to namespace members
+        </label><br>
+        <label>
+            <input type="radio" name="visibility" value="unlisted">
+            Unlisted - Accessible via direct link but hidden from listings
+        </label>
+    </fieldset><br>
+
     <button type="submit">Upload</button>
 </form>
 {% endblock %}