diff --git a/src/table/table_view.rs b/src/table/table_view.rs
index 00b4b66..15d8bee 100644
--- a/src/table/table_view.rs
+++ b/src/table/table_view.rs
@@ -77,11 +77,12 @@ async fn sort_and_search(tbl: Tbl, sort_dir: Option<u8>, sort_field: Option<usiz
 	sortfield = sort_field.unwrap();
     }
 
+    let tbl = inventur_db::sort_table(tbl.clone(), sortfield, sortdir);
     let column_names = tbl.column_names.clone();
     let column_types = tbl.column_types.clone().iter().map(|x: &inventur_db::FIELDTYPE| *x as i32).collect::<Vec<i32>>();
     let rows : Vec<Vec<String>>= tbl.rows.iter().map(|v| {let mut r = v.cells.clone(); r.insert(0, v.row_pos.to_string()); r}).collect();
 
-    PassTbl { tbl: inventur_db::sort_table(tbl.clone(), sortfield, sortdir), searchvalue, searchfields, sortdir, sortfield, tname: tbl.name, column_names, column_types, rows }
+    PassTbl { tbl: tbl.clone(), searchvalue, searchfields, sortdir, sortfield, tname: tbl.name, column_names, column_types, rows }
 
 }
 
diff --git a/templates/table.html.tera b/templates/table.html.tera
index 72b54af..a08a111 100644
--- a/templates/table.html.tera
+++ b/templates/table.html.tera
@@ -25,7 +25,7 @@
 
 <!-- Table header and editing -->
 <div class="row justify-content-between">
-  <div class="col-2 me-0 pe-0 pt-0 mt-0">
+  <div class="col-auto me-0 pe-0 pt-0 mt-0">
     <h1>
       <div class='input-group mt-0'>
 	<span id="tname">{{ tblname }}</span>
@@ -35,17 +35,17 @@
     </h1>
   </div>
 
-  <div class="col-1 align-self-start align-content-start ms-0 ps-0 mt-0 pt-0">
+  <div class="col-auto align-self-start align-content-start ms-0 ps-0 mt-0 pt-2">
     {% block share %}
     {% endblock share %}
   </div>
 
-  <div class="col-6">
+  <div class="col-auto">
     
   </div>
 
 <!-- Search bar -->
-  <div class="col-3 align-self-end align-content-end pt-0 mt-0">
+  <div class="col-auto align-self-end align-content-end pt-0 mt-0">
     <div class="btn-toolbar mt-0 pt-0" role="toolbar">
       {% block new_entry %}
       {% endblock new_entry %}