diff --git a/templates/partials/document_upload.html b/templates/partials/document_upload.html
index a4aa53c..20c9cc4 100644
--- a/templates/partials/document_upload.html
+++ b/templates/partials/document_upload.html
@@ -1,60 +1,5 @@
 {{define "document_upload"}}
 <h2>Document Uploads</h2>
-<div class="content">
-    <h3 class="submenu-header">Filter Jobs</h3>
-    <form id="filter-form" class="submenu-grid" hx-post="/filter-jobs" hx-target="#job-results" hx-swap="innerHTML">
-
-        <!-- Inline Group: Job Name and Company -->
-        <div class="inline-input-group">
-            <div class="input-group">
-                <label for="job_name">Job Name</label>
-                <input id="job_name" name="job_name" class="card-input" type="text" placeholder="Enter Job Name">
-            </div>
-            <div class="input-group">
-                <label for="company">Company</label>
-                <input id="company" name="company" class="card-input" type="text" placeholder="Enter Company Name">
-            </div>
-        </div>
-
-        <!-- Inline Group: Status and Tags -->
-        <div class="inline-input-group">
-            <div class="input-group">
-                <label for="status">Status</label>
-                <select id="status" name="status" class="card-input">
-                    <option value="">Select Status</option>
-                    <option value="open">Open</option>
-                    <option value="closed">Closed</option>
-                </select>
-            </div>
-            <div class="input-group">
-                <label for="tags">Tags</label>
-                <input id="tags" name="tags" class="card-input" type="text" placeholder="Enter Tags">
-            </div>
-            <div class="input-group">
-                <label for="schedule_from">Schedule From</label>
-                <input id="schedule_from" name="schedule_from" class="card-input" type="date">
-            </div>
-            <div class="input-group">
-                <label for="schedule_to">Schedule To</label>
-                <input id="schedule_to" name="schedule_to" class="card-input" type="date">
-            </div>
-        </div>
-
-        <!-- Inline Group: Date Range -->
-        <div class="inline-input-group">
-
-        </div>
-
-        <!-- Action Buttons -->
-        <div class="form-footer">
-            <button type="submit" class="btn-primary">Search</button>
-            <button type="reset" class="warning-button">Reset</button>
-        </div>
-    </form>
-
-    <!-- Results -->
-    <div id="job-results" class="submenu-container">
-        <!-- Search results will be dynamically loaded here -->
-    </div>
-</div>
+{{template "job_search_inputs"}}
+{{template "job_search_results"}}
 {{end}}
\ No newline at end of file
diff --git a/templates/partials/job_search_inputs.html b/templates/partials/job_search_inputs.html
new file mode 100644
index 0000000..d871da3
--- /dev/null
+++ b/templates/partials/job_search_inputs.html
@@ -0,0 +1,56 @@
+{{define "job_search_inputs"}}
+<div class="content">
+    <h3 class="submenu-header">Filter Jobs</h3>
+    <form id="filter-form" class="submenu-grid" hx-get="/jobs" hx-target="#job-results" hx-swap="innerHTML">
+
+        <!-- Inline Group: Job Name and Company -->
+        <div class="inline-input-group">
+            <div class="input-group">
+                <label for="job_number">Job Number</label>
+                <input id="job_number" name="refNumber" class="card-input" type="text" placeholder="Enter Job Name">
+            </div>
+            <div class="input-group">
+                <label for="name">Company</label>
+                <input id="name" name="name" class="card-input" type="text" placeholder="Enter Company Name">
+            </div>
+        </div>
+
+        <!-- Inline Group: Status and Tags -->
+        <div class="inline-input-group">
+            <div class="input-group">
+                <label for="status">Status</label>
+                <select id="status" name="status" class="card-input">
+                    <option value="">Select Status</option>
+                    <option value="open">Open</option>
+                    <option value="closed">Closed</option>
+                    <option value="all">All</option>
+                </select>
+            </div>
+            <div class="input-group">
+                <label for="tags">Tags</label>
+                <input id="tags" name="tags" class="card-input" type="text" placeholder="Enter Tags">
+            </div>
+            <div class="input-group">
+                <label for="schedule_from">Schedule From</label>
+                <input id="schedule_from" name="schedule_from" class="card-input" type="date">
+            </div>
+            <div class="input-group">
+                <label for="schedule_to">Schedule To</label>
+                <input id="schedule_to" name="schedule_to" class="card-input" type="date">
+            </div>
+        </div>
+
+        <!-- Inline Group: Date Range -->
+        <div class="inline-input-group">
+
+        </div>
+
+        <!-- Action Buttons -->
+        <div class="form-footer">
+            <button type="submit" class="btn-primary" hx-on="click">Search</button>
+            <button type="reset" class="warning-button">Reset</button>
+        </div>
+    </form>
+
+</div>
+{{end}}
\ No newline at end of file
diff --git a/templates/partials/job_search_results.html b/templates/partials/job_search_results.html
new file mode 100644
index 0000000..24fb8d8
--- /dev/null
+++ b/templates/partials/job_search_results.html
@@ -0,0 +1,27 @@
+{{define "job_search_results"}}
+<div id="job-results" class="submenu-container">
+    {{if .Jobs}}
+    <h3>Search Results</h3>
+    <table>
+        <thead>
+            <tr>
+                <th>Job Name</th>
+                <th>Location</th>
+                <th>Status</th>
+            </tr>
+        </thead>
+        <tbody>
+            {{range .Jobs}}
+            <tr>
+                <td>{{.Name}}</td>
+                <td>{{.Location.Name}} {{.Location.Address}}</td>
+                <td>{{.Status}}</td>
+            </tr>
+            {{end}}
+        </tbody>
+    </table>
+    {{else}}
+    <p>No jobs found matching your search criteria.</p>
+    {{end}}
+</div>
+{{end}}
\ No newline at end of file