diff --git a/templates/files.html b/templates/files.html
index f1c328f..064978c 100644
--- a/templates/files.html
+++ b/templates/files.html
@@ -16,14 +16,20 @@
             move_paths.push(p)
         {% endfor %}
 
-        document.OPT = '{{OPT}}'
-        document.entries = '{{entry_data}}'
-        document.how_many = '{{OPT.how_many}}'
-        document.entries_len = '{{entry_data|length}}'
+      // GLOBALS
+        // how many on this page, we can change this and redraw the page to suit (also used heavily in pagination code related to entry and page list)
+        var howMany = {{OPT.how_many}}
+
+        // this is the list of entry ids for the images for ALL matches for this query 
+        var entryList={{query_data.entry_list}}
+
+        // pageList is just those entries shown on this page from the full entryList
+        var pageList=[]
+        // force pageList to the first page
+        getPage(1)
     </script>
 
     <div class="container-fluid">
-        <form id="main_form" method="POST" action="/change_file_opts">
             <input type="hidden" name="cwd" id="cwd" value="{{OPT.cwd}}">
             {% if search_term is defined %}
                 <input type="hidden" name="search_term" id="view_term" value="{{search_term}}">
@@ -68,15 +74,11 @@
                     </script>
                 {% endif %}
                 <div class="col flex-grow-1 my-auto d-flex justify-content-center w-100">
-                    <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary">
+                    <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary disabled" onClick="prevPage()" disabled>
                         <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
                     </button>
                     <span class="sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
-                    {% set nxt_disabled="" %}
-                    {% if not entry_data or entry_data|length < OPT.how_many|int %}
-                        {% set nxt_disabled="disabled" %}
-                    {% endif %}
-                    <button aria-label="next" id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary">
+                    <button aria-label="next" id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage()">
                         <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
                     </button>
                     <button aria-label="move" id="move" disabled name="move" class="sm-txt btn btn-outline-primary ms-4" onClick="MoveDBox(move_paths,'{{url_for('internal', filename='icons.svg')}}'); return false;">
@@ -138,10 +140,10 @@
                 {% endif %}
             {% endfor %}
             <input name="eids" id="eids" type="hidden" value="{{eids.str}}">
-        </form>
     </div>
     {% set ecnt=namespace( val=0 ) %}
-    <div class="row ms-2">
+    <div id="figures" class="row ms-2">
+        <!--
         {% set last = namespace(printed=0) %}
         {# rare event of empty folder, still need to show back button #}
         {% if OPT.folders and entry_data|length == 0 %}
@@ -263,22 +265,22 @@
             {% endif %}
         {% endfor %}
 
+        -->
+
         </div>
         <div class="container-fluid">
-            <form id="nav_form" method="POST" action="/change_file_opts">
                 <input type="hidden" name="cwd" id="cwd" value="{{OPT.cwd}}">
                 <div class="row">
                     <div class="col my-auto d-flex justify-content-center">
-                        <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary">
+                        <button aria-label="prev" id="prev" name="prev" class="prev sm-txt btn btn-outline-secondary disabled" onClick="prevPage()" disabled>
                             <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#prev"/></svg>
                         </button>
                         <span class="sm-txt my-auto">&nbsp;{{OPT.how_many}} files&nbsp;</span>
-                        <button aria-label="next" id="next" {{nxt_disabled}} name="next" class="next sm-txt btn btn-outline-secondary">
+                        <button aria-label="next" id="next" name="next" class="next sm-txt btn btn-outline-secondary" onClick="nextPage()">
                             <svg width="16" height="16" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#next"/></svg>
                         </button>
                     </div>
                 </div>
-            </form>
         </div class="container">
 {% endblock main_content %}
 {% block script_content %}