diff --git a/src-tauri/src/database/connections.rs b/src-tauri/src/database/connections.rs
index 3ab511d..e598348 100644
--- a/src-tauri/src/database/connections.rs
+++ b/src-tauri/src/database/connections.rs
@@ -168,6 +168,14 @@ impl ConnectionConfig {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ResultSet {
+    pub affected_rows: u64,
+    pub warnings: u16,
+    pub info: String,
+    pub rows: Vec<serde_json::Value>,
+}
+
 impl ConnectedConnection {
     pub async fn new(config: ConnectionConfig) -> Result<Self> {
         match &config.scheme {
@@ -245,7 +253,7 @@ impl ConnectedConnection {
         }
     }
 
-    pub async fn execute_query(&self, q: &str) -> Result<Value> {
+    pub async fn execute_query(&self, q: &str) -> Result<ResultSet> {
         match &self.pool {
             ConnectionPool::Mysql(pool) => engine::mysql::query::execute_query(pool, q),
             // ConnectionPool::Postgres(_pool) => todo!(),
diff --git a/src-tauri/src/database/engine/mysql/query.rs b/src-tauri/src/database/engine/mysql/query.rs
index 479ef8d..ad36502 100644
--- a/src-tauri/src/database/engine/mysql/query.rs
+++ b/src-tauri/src/database/engine/mysql/query.rs
@@ -1,17 +1,11 @@
 use anyhow::Result;
 use mysql::prelude::Queryable;
 use mysql::{from_row, Pool, PooledConn, Row};
-use serde::{Deserialize, Serialize};
 use serde_json::json;
 
+use crate::database::connections::ResultSet;
+
 use super::utils::convert_value;
-#[derive(Debug, Serialize, Deserialize)]
-struct ResultSet {
-    affected_rows: u64,
-    warnings: u16,
-    info: String,
-    rows: Vec<serde_json::Value>,
-}
 
 fn row_to_object(row: Row) -> serde_json::Value {
     let mut object = json!({});
@@ -34,10 +28,9 @@ pub fn raw_query(mut conn: PooledConn, query: String) -> Result<serde_json::Valu
     return Ok(result);
 }
 
-pub fn execute_query(pool: &Pool, query: &str) -> Result<serde_json::Value> {
+pub fn execute_query(pool: &Pool, query: &str) -> Result<ResultSet> {
     let mut conn = pool.get_conn()?;
     let mut results = conn.query_iter(query)?;
-    let mut sets: Vec<ResultSet> = vec![];
     while let Some(result_set) = results.iter() {
         let affected_rows = result_set.affected_rows();
         let warnings = result_set.warnings();
@@ -52,9 +45,13 @@ pub fn execute_query(pool: &Pool, query: &str) -> Result<serde_json::Value> {
             info: info.to_string(),
             rows,
         };
-        sets.push(set);
+        return Ok(set);
     }
-    let result = json!(sets);
 
-    return Ok(result);
+    return Ok(ResultSet {
+        affected_rows: 0,
+        warnings: 0,
+        info: "".to_string(),
+        rows: Vec::new(),
+    });
 }
diff --git a/src-tauri/src/handlers/queries.rs b/src-tauri/src/handlers/queries.rs
index fd696e8..7a07ccf 100644
--- a/src-tauri/src/handlers/queries.rs
+++ b/src-tauri/src/handlers/queries.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
+use serde_json::{Value, json};
 use sqlparser::{dialect::dialect_from_str, parser::Parser};
 use tauri::{command, AppHandle, State};
 use tracing::info;
@@ -91,7 +91,7 @@ pub async fn execute_query(
 ) -> CommandResult<Value> {
     let connection = app_handle.acquire_connection(conn_id);
     let result = connection.execute_query(&query).await?;
-    Ok(result)
+    Ok(json!({ "result": result }))
 }
 
 #[command]
diff --git a/src-tauri/src/queues/query.rs b/src-tauri/src/queues/query.rs
index 9c4f9c7..4d44f09 100644
--- a/src-tauri/src/queues/query.rs
+++ b/src-tauri/src/queues/query.rs
@@ -72,6 +72,7 @@ pub struct QueryTaskEnqueueResult {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct QueryTaskResult {
+    pub conn_id: String,
     pub status: QueryTaskStatus,
     pub query: String,
     pub id: String,
@@ -88,11 +89,12 @@ pub async fn async_process_model(
     while let Some(input) = input_rx.recv().await {
         let task = input;
         match task.conn.execute_query(&task.query).await {
-            Ok(content) => {
-                match write_query(&task.id, &content.to_string()) {
+            Ok(result_set) => {
+                match write_query(&task.id, result_set) {
                     Ok(path) => {
                         output_tx
                             .send(QueryTaskResult {
+                                conn_id: task.conn.config.id.to_string(),
                                 status: QueryTaskStatus::Completed,
                                 query: task.query,
                                 id: task.id,
@@ -106,6 +108,7 @@ pub async fn async_process_model(
                     Err(e) => {
                         output_tx
                             .send(QueryTaskResult {
+                                conn_id: task.conn.config.id.to_string(),
                                 status: QueryTaskStatus::Error,
                                 query: task.query,
                                 id: task.id,
@@ -121,6 +124,7 @@ pub async fn async_process_model(
             Err(e) => {
                 output_tx
                     .send(QueryTaskResult {
+                        conn_id: task.conn.config.id.to_string(),
                         status: QueryTaskStatus::Error,
                         query: task.query,
                         id: task.id,
diff --git a/src-tauri/src/utils/init.rs b/src-tauri/src/utils/init.rs
index 40f0bf2..459b668 100644
--- a/src-tauri/src/utils/init.rs
+++ b/src-tauri/src/utils/init.rs
@@ -1,7 +1,8 @@
 use std::{fs, path::PathBuf};
 
-use crate::database::database::create_app_db;
+use crate::database::{database::create_app_db, connections::ResultSet};
 use anyhow::Result;
+use serde_json::json;
 use tauri::api::dir::with_temp_dir;
 use tracing::{debug, error};
 
@@ -45,9 +46,19 @@ pub fn write_file(path: &PathBuf, content: &str) -> Result<()> {
     Ok(())
 }
 
-pub fn write_query(id: &str, content: &str) -> Result<String> {
+pub fn write_query(id: &str, result_set: ResultSet) -> Result<String> {
+    let rows = json!(result_set.rows).to_string();
+    let metadata = json!({
+        "rows": result_set.rows.len(),
+        "affected_rows": result_set.affected_rows,
+        "warnings": result_set.warnings,
+        "info": result_set.info,
+    })
+    .to_string();
     let tmp_dir = get_tmp_dir()?;
-    let path = tmp_dir + "/" + id;
-    write_file(&PathBuf::from(&path), content)?;
+    let path = tmp_dir.clone() + "/" + id;
+    let metadata_path = tmp_dir + "/" + id + ".metadata";
+    write_file(&PathBuf::from(&path), &rows)?;
+    write_file(&PathBuf::from(&metadata_path), &metadata)?;
     Ok(path)
 }
diff --git a/src/App.tsx b/src/App.tsx
index abdeb6d..2517533 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -6,11 +6,19 @@ import { CommandPaletteContext } from "components/CommandPalette/CommandPaletteC
 import { Loader } from "components/UI";
 import { createEffect, createSignal, onMount } from "solid-js";
 import { useAppSelector } from "services/Context";
+import { listen } from "@tauri-apps/api/event";
+import { Events, QueryTaskResult } from "interfaces";
+import { log } from "utils/utils";
 
 function App() {
   const [loading, setLoading] = createSignal(true);
   const {
-    connections: { restoreConnectionStore },
+    connections: {
+      restoreConnectionStore,
+      getConnection,
+      contentStore: { idx },
+      queryIdx,
+    },
     app: { restoreAppStore },
   } = useAppSelector();
 
@@ -20,6 +28,25 @@ function App() {
     }, 500);
   });
 
+  const getQueryResults = () => { };
+
+  const compareAndAssign = (event: QueryTaskResult) => {
+    if (
+      getConnection().id === event.conn_id &&
+      idx === event.tab_idx &&
+      queryIdx() === event.query_idx
+    ) {
+      // TODO: should get 0 page of results
+    }
+  };
+
+  onMount(async () => {
+    await listen<QueryTaskResult>(Events.QueryFinished, (event) => {
+      log(event);
+      compareAndAssign(event.payload);
+    });
+  });
+
   onMount(async () => {
     const theme = localStorage.getItem("theme") || "dark";
     document.documentElement.dataset.theme = theme;
diff --git a/src/components/CommandPalette/actions.ts b/src/components/CommandPalette/actions.ts
index 4bd6f9e..e1c97ec 100644
--- a/src/components/CommandPalette/actions.ts
+++ b/src/components/CommandPalette/actions.ts
@@ -3,18 +3,18 @@ import { t } from "utils/i18n";
 
 const focusOn = defineAction({
   id: "focus_on",
-  title: t("command_palette.focus_on"),
+  title: t('command_palette.focus_on'),
 });
 
 const focusQueryTextArea = defineAction({
   id: "focus_query_text_area",
-  title: t("command_palette.focus_query_text_area"),
+  title: t('command_palette.focus_query_text_area'),
   parentActionId: focusOn.id,
   /* Condition for allowing action */
   shortcut: "$mod+l", // $mod = Command on Mac & Control on Windows.
   run: () => {
     // document.dispatchEvent(
-    //   new KeyboardEvent("keydown", {
+    //   new KeyboardEvent('keydown', {
     //     code: "KeyL", // put everything you need in this object.
     //     ctrlKey: true, // if you aren't going to use them.
     //   })
diff --git a/src/components/Screens/Console/Content/Content.tsx b/src/components/Screens/Console/Content/Content.tsx
index 733c8fa..23b0244 100644
--- a/src/components/Screens/Console/Content/Content.tsx
+++ b/src/components/Screens/Console/Content/Content.tsx
@@ -30,7 +30,7 @@ export const Content = () => {
                 tabindex={0}
                 onClick={() => setContentIdx(idx())}
               >
-                {t("components.console.query")} #{idx() + 1}
+                {t('console.query')} #{idx() + 1}
               </button>
               <Show when={idx() > 0}>
                 <button
diff --git a/src/components/Screens/Console/Content/QueryTab/QueryTab.tsx b/src/components/Screens/Console/Content/QueryTab/QueryTab.tsx
index 3117f78..9c75272 100644
--- a/src/components/Screens/Console/Content/QueryTab/QueryTab.tsx
+++ b/src/components/Screens/Console/Content/QueryTab/QueryTab.tsx
@@ -1,17 +1,9 @@
 import { ResultsTable } from "./ResultesTable";
-import { useAppSelector } from "services/Context";
-import { createEffect, createSignal, onCleanup, Show } from "solid-js";
+import { createEffect, onCleanup } from "solid-js";
 import Split from "split.js";
 import { QueryTextArea } from "./QueryTextArea";
-import { createStore } from "solid-js/store";
-import { Row } from "interfaces";
-import { createShortcut } from "@solid-primitives/keyboard";
 
 export const QueryTab = () => {
-  const {
-    connections: { getContent },
-  } = useAppSelector();
-  const [idx, setIdx] = createSignal(0);
   createEffect(() => {
     const q = Split(["#query", "#results"], {
       sizes: [30, 80],
@@ -26,42 +18,13 @@ export const QueryTab = () => {
     });
   });
 
-  const {
-    connections: { getContentData },
-  } = useAppSelector();
-  const [rows, setRows] = createStore<Row[]>([]);
-
-  createEffect(() => {
-    setRows(getContentData("Query").result_sets[idx()]?.rows || []);
-  });
-
-  const onPrevClick = () => {
-    setIdx(
-      (idx() - 1 + getContentData("Query").result_sets.length) %
-      getContentData("Query").result_sets.length
-    );
-  };
-
-  const onNextClick = () => {
-    setIdx((idx() + 1) % getContentData("Query").result_sets.length);
-  };
-
-  createShortcut(["Control", "Shift", "N"], onNextClick);
-  createShortcut(["Control", "Shift", "P"], onPrevClick);
-
   return (
     <div class="flex flex-col h-full overflow-hidden">
       <div id="query" class="flex flex-col">
-        <QueryTextArea
-          idx={idx}
-          onPrevClick={onPrevClick}
-          onNextClick={onNextClick}
-        />
+        <QueryTextArea />
       </div>
-      <div id="results">
-        <Show when={!getContent().error}>
-          <ResultsTable rows={rows} />
-        </Show>
+      <div id="results" class="flex">
+        <ResultsTable />
       </div>
     </div>
   );
diff --git a/src/components/Screens/Console/Content/QueryTab/QueryTextArea.tsx b/src/components/Screens/Console/Content/QueryTab/QueryTextArea.tsx
index af6a927..3784d12 100644
--- a/src/components/Screens/Console/Content/QueryTab/QueryTextArea.tsx
+++ b/src/components/Screens/Console/Content/QueryTab/QueryTextArea.tsx
@@ -3,14 +3,7 @@ import {
   createEditorControlledValue,
   createEditorFocus,
 } from "solid-codemirror";
-import {
-  Accessor,
-  createEffect,
-  createSignal,
-  For,
-  onMount,
-  Show,
-} from "solid-js";
+import { createEffect, createSignal, Show } from "solid-js";
 import {
   EditorView,
   drawSelection,
@@ -22,32 +15,20 @@ import { dracula } from "@uiw/codemirror-theme-dracula";
 import { vim } from "@replit/codemirror-vim";
 import { format } from "sql-formatter";
 import { invoke } from "@tauri-apps/api";
-import {
-  ChevronLeft,
-  ChevronRight,
-  Copy,
-  EditIcon,
-  FireIcon,
-  VimIcon,
-} from "components/UI/Icons";
+import { Copy, EditIcon, FireIcon, VimIcon } from "components/UI/Icons";
 import { useAppSelector } from "services/Context";
-import { Events, QueryTaskEnqueueResult } from "interfaces";
+import { QueryTaskEnqueueResult } from "interfaces";
 import { t } from "utils/i18n";
 import { Alert } from "components/UI";
 import { basicSetup } from "codemirror";
 import { createShortcut } from "@solid-primitives/keyboard";
 import { search } from "@codemirror/search";
 import { createStore } from "solid-js/store";
-import { ActionRowButton } from "./ActionRowButton";
+import { ActionRowButton } from "./components/ActionRowButton";
 
-import { listen } from "@tauri-apps/api/event";
 import { log } from "utils/utils";
 
-export const QueryTextArea = (props: {
-  idx: Accessor<number>;
-  onPrevClick: () => void;
-  onNextClick: () => void;
-}) => {
+export const QueryTextArea = () => {
   const {
     connections: {
       updateContentTab,
@@ -100,12 +81,6 @@ export const QueryTextArea = (props: {
     updateQueryText(formatted);
   };
 
-  onMount(async () => {
-    await listen(Events.QueryFinished, (event) => {
-      log(event);
-    });
-  });
-
   const getSelection = () => {
     return editorView().state.sliceDoc(
       editorView().state.selection.ranges[0].from,
@@ -161,31 +136,31 @@ export const QueryTextArea = (props: {
       <div class="w-full px-2 py-1 bg-base-100 border-b-2 border-accent flex justify-between items-center">
         <div class="flex items-center">
           <ActionRowButton
-            dataTip={t("components.console.actions.format")}
+            dataTip={t("console.actions.format")}
             onClick={onFormat}
             icon={<EditIcon />}
           />
           <ActionRowButton
-            dataTip={t("components.console.actions.execute")}
+            dataTip={t("console.actions.execute")}
             onClick={onExecute}
             loading={loading()}
             icon={<FireIcon />}
           />
 
           <ActionRowButton
-            dataTip={t("components.console.actions.copy_query")}
+            dataTip={t("console.actions.copy_query")}
             onClick={copyQueryToClipboard}
             icon={<Copy />}
           />
 
           <div
             class="tooltip tooltip-primary tooltip-bottom"
-            data-tip={t("components.console.actions.auto_limit")}
+            data-tip={t("console.actions.auto_limit")}
           >
             <div class="form-control">
               <label class="cursor-pointer label">
                 <span class="label-text font-semibold mr-2 text-primary mt-1">
-                  {t("components.console.actions.limit")}
+                  {t("console.actions.limit")}
                 </span>
                 <input
                   type="checkbox"
@@ -199,7 +174,7 @@ export const QueryTextArea = (props: {
 
           <div
             class="tooltip tooltip-primary tooltip-bottom"
-            data-tip={t("components.console.actions.vim_mode_on")}
+            data-tip={t("console.actions.vim_mode_on")}
           >
             <div class="flex items-center mx-2">
               <span class="mr-2">
@@ -220,36 +195,6 @@ export const QueryTextArea = (props: {
         <Show when={getContent().error}>
           <Alert color="error">{getContent().error}</Alert>
         </Show>
-        <Show when={!getContent().error}>
-          <For each={getContentData("Query").result_sets}>
-            {(result_set, index) => (
-              <Show when={index() === props.idx()}>
-                <Alert color="info">
-                  <span class="font-semibold">
-                    {t("components.console.result_set")}
-                    <button
-                      class="btn btn-xs mx-0.5 btn-neutral h-5 min-h-0"
-                      onClick={props.onPrevClick}
-                    >
-                      <ChevronLeft />
-                    </button>
-                    {"#" + (props.idx() + 1)}
-                    <button
-                      class="btn btn-xs mx-0.5 btn-neutral h-5 min-h-0"
-                      onClick={props.onNextClick}
-                    >
-                      <ChevronRight />
-                    </button>
-                    {t("components.console.out_of") +
-                      getContentData("Query").result_sets.length +
-                      ". "}
-                  </span>
-                  <span class="font-semibold">{result_set.info + ""}</span>
-                </Alert>
-              </Show>
-            )}
-          </For>
-        </Show>
       </div>
       <div class="overflow-hidden w-full h-full">
         <div ref={ref} class="w-full h-full" />
diff --git a/src/components/Screens/Console/Content/QueryTab/ResultesTable.tsx b/src/components/Screens/Console/Content/QueryTab/ResultesTable.tsx
index 3603314..df30147 100644
--- a/src/components/Screens/Console/Content/QueryTab/ResultesTable.tsx
+++ b/src/components/Screens/Console/Content/QueryTab/ResultesTable.tsx
@@ -1,4 +1,3 @@
-import { Row } from "interfaces";
 import { createEffect, createSignal } from "solid-js";
 import { TabulatorFull as Tabulator } from "tabulator-tables";
 import { dracula } from "@uiw/codemirror-theme-dracula";
@@ -9,6 +8,8 @@ import {
   createCodeMirror,
   createEditorControlledValue,
 } from "solid-codemirror";
+import { Pagination } from "./components/Pagination";
+import { useAppSelector } from "services/Context";
 
 const parseObjRecursive = (obj: any): Record<string, any> => {
   if (typeof obj === "object") {
@@ -30,12 +31,15 @@ const parseObjRecursive = (obj: any): Record<string, any> => {
   }
 };
 
-export const ResultsTable = (props: { rows: Row[] }) => {
+export const ResultsTable = () => {
+  const {
+    connections: { queryIdx },
+  } = useAppSelector();
   const [code, setCode] = createSignal("");
   const { ref, editorView, createExtension } = createCodeMirror({
     onValueChange: setCode,
   });
-  const [paginationSize] = createSignal(20);
+  const [table, setTable] = createSignal<Tabulator | null>(null);
   createEditorControlledValue(editorView, code);
   createExtension(() => search());
   createExtension(dracula);
@@ -46,80 +50,87 @@ export const ResultsTable = (props: { rows: Row[] }) => {
   createExtension(lineWrapping);
 
   createEffect(() => {
-    let columns: { title: string; field: string; resizeable: boolean }[] = [];
-    if (props.rows.length) {
-      columns = Object.keys(props.rows[0]).map((k) => ({
-        title: k,
-        field: k,
-        resizeable: true,
-        // editor: "input" as const, // this will make the whole table navigable
-      }));
-    }
-
-    new Tabulator("#results-table", {
-      data: props.rows,
-      columns,
-      columnDefaults: {
-        title: "",
-        width: 350,
-      },
-      layout: "fitDataStretch",
-      autoResize: true,
-      clipboard: true,
-      pagination: true,
-      paginationSize: paginationSize(),
-      height: "100%",
-      paginationCounter: "rows",
-      debugInvalidOptions: false,
-      rowContextMenu: [
-        {
-          label: "Show row in JSON",
-          action: function(_e, row) {
-            // @ts-ignore
-            const data = parseObjRecursive(row._row.data);
-            setCode(JSON.stringify(data, null, 4));
-            // @ts-ignore
-            document.getElementById("my_modal_1").showModal();
-          },
-        },
-        {
-          label: "Copy row to clipboard",
-          action: function(_e, row) {
-            // @ts-ignore
-            navigator.clipboard.writeText(JSON.stringify(row._row.data));
-          },
-        },
-        {
-          separator: true,
-        },
-      ],
-      // only relevant if editor is set to "input"
-      // keybindings: {
-      //   //@ts-ignore
-      //   navUp: ["ctrl + shift + k", 38],
-      //   //@ts-ignore
-      //   navDown: ["ctrl + shift + j", 40],
-      //   //@ts-ignore
-      //   navLeft: ["ctrl + shift + h", 37],
-      //   //@ts-ignore
-      //   navRight: ["ctrl + shift + l", 39],
-      // },
-    });
+    console.log(queryIdx);
+    // let columns: { title: string; field: string; resizeable: boolean }[] = [];
+    // if (length) {
+    //   columns = Object.keys(props.rows[0]).map((k) => ({
+    //     title: k,
+    //     field: k,
+    //     resizeable: true,
+    //     // editor: "input" as const, // this will make the whole table navigable
+    //   }));
+    // }
+    //
+    // const _table = new Tabulator("#results-table", {
+    //   data: props.rows,
+    //   columns,
+    //   columnDefaults: {
+    //     title: "",
+    //     width: 350,
+    //   },
+    //   layout: "fitDataStretch",
+    //   autoResize: true,
+    //   clipboard: true,
+    //   pagination: false,
+    //   paginationSize: paginationSize(),
+    //   height: "100%",
+    //   paginationCounter: "rows",
+    //   debugInvalidOptions: false,
+    //   rowContextMenu: [
+    //     {
+    //       label: "Show row in JSON",
+    //       action: function(_e, row) {
+    //         // @ts-ignore
+    //         const data = parseObjRecursive(row._row.data);
+    //         setCode(JSON.stringify(data, null, 4));
+    //         // @ts-ignore
+    //         document.getElementById("my_modal_1").showModal();
+    //       },
+    //     },
+    //     {
+    //       label: "Copy row to clipboard",
+    //       action: function(_e, row) {
+    //         // @ts-ignore
+    //         navigator.clipboard.writeText(JSON.stringify(row._row.data));
+    //       },
+    //     },
+    //     {
+    //       separator: true,
+    //     },
+    //   ],
+    //   // only relevant if editor is set to "input"
+    //   // keybindings: {
+    //   //   //@ts-ignore
+    //   //   navUp: ["ctrl + shift + k", 38],
+    //   //   //@ts-ignore
+    //   //   navDown: ["ctrl + shift + j", 40],
+    //   //   //@ts-ignore
+    //   //   navLeft: ["ctrl + shift + h", 37],
+    //   //   //@ts-ignore
+    //   //   navRight: ["ctrl + shift + l", 39],
+    //   // },
+    // });
+    // setTable(_table);
   });
 
   return (
-    <>
+    <div class="flex-1 flex flex-col">
       <dialog id="my_modal_1" class="modal">
         <div class="modal-box min-w-[1000px] max-h-full h-[80%]">
           <div class="h-full">
-            <div ref={ref} class="h-full"/>
+            <div ref={ref} class="h-full" />
           </div>
         </div>
         <form method="dialog" class="modal-backdrop">
           <button>close</button>
         </form>
       </dialog>
-      <div id="results-table"></div>
-    </>
+      <Pagination table={table()} />
+      <div class="flex-1 bg-red-200">
+        <div id="results-table">
+          <div id="loading-overlay"></div>
+        </div>
+      </div>
+    </div>
   );
 };
diff --git a/src/components/Screens/Console/Content/QueryTab/ActionRowButton.tsx b/src/components/Screens/Console/Content/QueryTab/components/ActionRowButton.tsx
similarity index 100%
rename from src/components/Screens/Console/Content/QueryTab/ActionRowButton.tsx
rename to src/components/Screens/Console/Content/QueryTab/components/ActionRowButton.tsx
diff --git a/src/components/Screens/Console/Content/QueryTab/components/Pagination.tsx b/src/components/Screens/Console/Content/QueryTab/components/Pagination.tsx
new file mode 100644
index 0000000..dff77a0
--- /dev/null
+++ b/src/components/Screens/Console/Content/QueryTab/components/Pagination.tsx
@@ -0,0 +1,55 @@
+import { TabulatorFull as Tabulator } from "tabulator-tables";
+import { Alert } from "components/UI";
+import { useAppSelector } from "services/Context";
+import { createShortcut } from "@solid-primitives/keyboard";
+import { ChevronLeft, ChevronRight } from "components/UI/Icons";
+import { t } from "utils/i18n";
+
+type PaginationProps = {
+  table: Tabulator | null;
+};
+
+export const Pagination = (_props: PaginationProps) => {
+  const {
+    connections: {
+      selectNextQuery,
+      selectPrevQuery,
+      queryIdx
+    },
+  } = useAppSelector();
+
+  createShortcut(["Control", "Shift", "N"], selectNextQuery);
+  createShortcut(["Control", "Shift", "P"], selectPrevQuery);
+
+  return (
+    <div class="container flex justify-between items-top p-1 my-1 gap-2 bg-base-200">
+      <div class="flex gap-2">
+        <div class="join">
+          <button class="join-item btn btn-sm" onClick={selectPrevQuery}>
+            <ChevronLeft />
+          </button>
+          <button class="join-item btn btn-sm btn-disabled !text-info">
+            <span class="mt-1">
+              {t("console.result_set")} {queryIdx() + 1}
+            </span>
+          </button>
+          <button class="join-item btn btn-sm" onClick={selectNextQuery}>
+            <ChevronRight />
+          </button>
+        </div>
+        <div class="flex-1">
+          <Alert color="info">
+            Lorem ipsum dolor sit amet, qui minim labore adipisicing minim
+          </Alert>
+        </div>
+      </div>
+      <div class="join">
+        <button class="join-item btn btn-sm">1</button>
+        <button class="join-item btn btn-sm">2</button>
+        <button class="join-item btn btn-sm btn-disabled">...</button>
+        <button class="join-item btn btn-sm">99</button>
+        <button class="join-item btn btn-sm">100</button>
+      </div>
+    </div>
+  );
+};
diff --git a/src/components/Screens/Console/Content/TableStructure/TableStructureTab.tsx b/src/components/Screens/Console/Content/TableStructure/TableStructureTab.tsx
index 91f0b2c..a93b3ad 100644
--- a/src/components/Screens/Console/Content/TableStructure/TableStructureTab.tsx
+++ b/src/components/Screens/Console/Content/TableStructure/TableStructureTab.tsx
@@ -28,7 +28,7 @@ export const TableStructureTab = () => {
                 classList={{ "tab-active": tab() === ta }}
                 class="tab"
               >
-                {t(`components.table_structure_tab.${ta}`)}
+                {t(`table_structure_tab.${ta}`)}
               </button>
             ))}
           </div>
diff --git a/src/components/Screens/Console/Sidebar/Sidebar.tsx b/src/components/Screens/Console/Sidebar/Sidebar.tsx
index ce36912..13dfd36 100644
--- a/src/components/Screens/Console/Sidebar/Sidebar.tsx
+++ b/src/components/Screens/Console/Sidebar/Sidebar.tsx
@@ -90,7 +90,7 @@ export const Sidebar = () => {
       </div>
       <div class="overflow-y-auto h-full">
         <div class="text-xs font-bold py-1">
-          {t("components.sidebar.tables")}
+          {t('sidebar.tables')}
         </div>
         <For each={tables}>
           {(table) => (
diff --git a/src/components/Screens/Console/Sidebar/TableColumnsCollapse.tsx b/src/components/Screens/Console/Sidebar/TableColumnsCollapse.tsx
index f815064..3aa0dd4 100644
--- a/src/components/Screens/Console/Sidebar/TableColumnsCollapse.tsx
+++ b/src/components/Screens/Console/Sidebar/TableColumnsCollapse.tsx
@@ -63,7 +63,7 @@ export const TableColumnsCollapse = (props: {
         query,
         autoLimit: false,
       });
-      notify(t("components.sidebar.table_was_truncated", { table }), "success");
+      notify(t('sidebar.table_was_truncated', { table }), "success");
     } catch (error) {
       notify(error);
     }
@@ -73,13 +73,13 @@ export const TableColumnsCollapse = (props: {
     <div class="w-full" onContextMenu={(e) => show(e)}>
       <Menu id={menu_id} animation={animation.fade} theme={"dark"}>
         <Item onClick={({ props }) => addTableStructureTab(props.table)}>
-          {t("components.sidebar.show_table_structure")}
+          {t('sidebar.show_table_structure')}
         </Item>
         <Item onClick={({ props }) => listData(props.table)}>
-          {t("components.sidebar.list_data")}
+          {t('sidebar.list_data')}
         </Item>
         <Item onClick={({ props }) => truncateTable(props.table)}>
-          {t("components.sidebar.truncate_table")}
+          {t('sidebar.truncate_table')}
         </Item>
       </Menu>
       <span
diff --git a/src/components/Screens/Home/Connections/AddConnectionForm.tsx b/src/components/Screens/Home/Connections/AddConnectionForm.tsx
index 131e1d1..de1fb2a 100644
--- a/src/components/Screens/Home/Connections/AddConnectionForm.tsx
+++ b/src/components/Screens/Home/Connections/AddConnectionForm.tsx
@@ -35,7 +35,7 @@ const MAX_PORT = 65535;
 const MIN_PORT = 1;
 
 const messages = {
-  length: t("components.add_connection_form.length_validation"),
+  length: t('add_connection_form.length_validation'),
 };
 
 export const ConnectionFormSchema = z.object({
@@ -172,7 +172,7 @@ const AddConnectionForm = (props: {
       >
         <div>
           <h2 class="text-2xl font-bold">
-            {t("components.add_connection_form.title")}
+            {t('add_connection_form.title')}
           </h2>
         </div>
         <div class="grid grid-cols-6 gap-3">
@@ -184,7 +184,7 @@ const AddConnectionForm = (props: {
             <Select
               id="scheme"
               name="scheme"
-              label={t("components.add_connection_form.labels.scheme")}
+              label={t('add_connection_form.labels.scheme')}
               options={dialects.map((sc) => ({
                 value: sc,
                 label: titleCase(sc),
@@ -206,7 +206,7 @@ const AddConnectionForm = (props: {
               <Select
                 id="mode"
                 name="mode"
-                label={t("components.add_connection_form.labels.mode")}
+                label={t('add_connection_form.labels.mode')}
                 options={AvailableConnectionModes[formData().scheme].map(
                   (md) => ({ value: md, label: titleCase(md) })
                 )}
@@ -226,14 +226,14 @@ const AddConnectionForm = (props: {
             <Switch>
               <Match when={formData().scheme === Dialect.Sqlite}>
                 <FileInput
-                  label={t("components.add_connection_form.labels.file")}
+                  label={t('add_connection_form.labels.file')}
                   formHandler={formHandler}
                   name="file"
                 />
               </Match>
               <Match when={formData().scheme !== Dialect.Sqlite}>
                 <TextInput
-                  label={t("components.add_connection_form.labels.dbname")}
+                  label={t('add_connection_form.labels.dbname')}
                   min={1}
                   max={255}
                   name="dbname"
@@ -250,7 +250,7 @@ const AddConnectionForm = (props: {
               <Match when={formData().mode === ConnectionMode.Host}>
                 <div class="col-span-4">
                   <TextInput
-                    label={t("components.add_connection_form.labels.host")}
+                    label={t('add_connection_form.labels.host')}
                     min={1}
                     max={255}
                     name="host"
@@ -260,7 +260,7 @@ const AddConnectionForm = (props: {
                 </div>
                 <div class="col-span-2">
                   <TextInput
-                    label={t("components.add_connection_form.labels.port")}
+                    label={t('add_connection_form.labels.port')}
                     name="port"
                     id="port"
                     formHandler={formHandler}
@@ -273,9 +273,7 @@ const AddConnectionForm = (props: {
               <Match when={formData().mode === ConnectionMode.Socket}>
                 <div class="col-span-6">
                   <TextInput
-                    label={t(
-                      "components.add_connection_form.labels.socket_path"
-                    )}
+                    label={t('add_connection_form.labels.socket_path')}
                     min={1}
                     max={255}
                     name="socket_path"
@@ -290,7 +288,7 @@ const AddConnectionForm = (props: {
           <div class="grid grid-cols-2 gap-3">
             <div class="w-full">
               <TextInput
-                label={t("components.add_connection_form.labels.username")}
+                label={t('add_connection_form.labels.username')}
                 min={1}
                 max={255}
                 name="username"
@@ -300,7 +298,7 @@ const AddConnectionForm = (props: {
             </div>
             <div class="w-full">
               <TextInput
-                label={t("components.add_connection_form.labels.password")}
+                label={t('add_connection_form.labels.password')}
                 name="password"
                 id="password"
                 min={1}
@@ -314,7 +312,7 @@ const AddConnectionForm = (props: {
           <div class="grid grid-cols-5 gap-3">
             <div class="col-span-3">
               <TextInput
-                label={t("components.add_connection_form.labels.name")}
+                label={t('add_connection_form.labels.name')}
                 name="name"
                 formHandler={formHandler}
                 id="name"
@@ -327,7 +325,7 @@ const AddConnectionForm = (props: {
                 <div class="flex items-end gap-3">
                   <ColorCircle color={formData().color} />
                   <Select
-                    label={t("components.add_connection_form.labels.color")}
+                    label={t('add_connection_form.labels.color')}
                     name="color"
                     class="w-full"
                     options={connectionColors.map((color) => ({
@@ -346,7 +344,7 @@ const AddConnectionForm = (props: {
             <Alert color="error">
               {getFormErrors().map((error) => (
                 <p class="text-bold">
-                  {t(`components.add_connection_form.labels.${error.path}`)}:{" "}
+                  {t(`add_connection_form.labels.${error.path}`)}:{" "}
                   {error.message}
                 </p>
               ))}
@@ -360,7 +358,7 @@ const AddConnectionForm = (props: {
             btn-primary btn-md btn-block"
             type="submit"
           >
-            {t("components.add_connection_form.title")}
+            {t('add_connection_form.title')}
           </button>
         </div>
       </form>
diff --git a/src/components/Screens/Home/Connections/ConnectionsList/ConnectionsList.tsx b/src/components/Screens/Home/Connections/ConnectionsList/ConnectionsList.tsx
index 15324f5..d73ebc1 100644
--- a/src/components/Screens/Home/Connections/ConnectionsList/ConnectionsList.tsx
+++ b/src/components/Screens/Home/Connections/ConnectionsList/ConnectionsList.tsx
@@ -40,16 +40,16 @@ export const ConnectionsList = (props: { connections: ConnectionConfig[], setCon
         </For>
       </ul>
       <Menu id={menu_id} animation={animation.fade} theme={'dark'}>
-        <Item onClick={() => (window as any)[modal_id].showModal()}>{t('components.connections_list.actions.delete')}</Item>
+        <Item onClick={() => (window as any)[modal_id].showModal()}>{t('connections_list.actions.delete')}</Item>
       </Menu>
       <dialog id={modal_id} class="modal">
         <form method="dialog" class="modal-box">
-          <h3 class="font-bold text-lg">{t('components.connections_list.actions.confirm_action')}</h3>
-          <p class="py-4">{t('components.connections_list.actions.confirm_delete')}</p>
+          <h3 class="font-bold text-lg">{t('connections_list.actions.confirm_action')}</h3>
+          <p class="py-4">{t('connections_list.actions.confirm_delete')}</p>
           <p class="py-4">{focusedConnection()?.name}</p>
           <div class="grid grid-cols-2 gap-3">
-            <button class="btn btn-error btn-sm" onClick={() => deleteConnection(focusedConnection()?.id!)}>{t('components.connections_list.actions.yes')}</button>
-            <button class="btn btn-primary btn-sm">{t('components.connections_list.actions.cancel')}</button>
+            <button class="btn btn-error btn-sm" onClick={() => deleteConnection(focusedConnection()?.id!)}>{t('connections_list.actions.yes')}</button>
+            <button class="btn btn-primary btn-sm">{t('connections_list.actions.cancel')}</button>
           </div>
         </form>
         <form method="dialog" class="modal-backdrop">
diff --git a/src/components/UI/FileInput.tsx b/src/components/UI/FileInput.tsx
index 16aa6a1..8401f79 100644
--- a/src/components/UI/FileInput.tsx
+++ b/src/components/UI/FileInput.tsx
@@ -34,7 +34,7 @@ export const FileInput: Component<FileInputProps> = (props) => {
             type="button"
             onClick={() => fileInput?.click()}
           >
-            <span class="p-2 border-end">{t('components.file_input.choose_file')}</span>
+            <span class="p-2 border-end">{t('file_input.choose_file')}</span>
           </button>
         </div>
       )}
diff --git a/src/components/UI/ThemeSwitch.tsx b/src/components/UI/ThemeSwitch.tsx
index 1df07a6..7cfbee6 100644
--- a/src/components/UI/ThemeSwitch.tsx
+++ b/src/components/UI/ThemeSwitch.tsx
@@ -23,7 +23,7 @@ export const ThemeSwitch = () => {
   return (
     <div class="dropdown">
       <label id="theme-switch" tabindex="0" class="btn btn-sm btn-primary">
-        {t("components.theme_switch.theme")}
+        {t('theme_switch.theme')}
       </label>
       <ul
         tabindex={0}
diff --git a/src/index.css b/src/index.css
index f0332c8..d38b03e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -170,6 +170,10 @@ dialog {
   @apply text-base-content bg-base-300 !important;
 }
 
+.tabulator .tabulator-tableholder {
+  @apply bg-base-200 !important;
+}
+
 #results {
   -webkit-user-select: auto; /* Safari */
   -ms-user-select: auto; /* IE 10 and IE 11 */
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 1521208..da5d2b1 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -138,6 +138,17 @@ export type QueryTaskEnqueueResult = {
   results_sets: string[];
 };
 
+export type QueryTaskResult = {
+  conn_id: string;
+  status: QueryTaskStatusType;
+  query: string;
+  id: string;
+  path: string | undefined;
+  error: string | undefined;
+  tab_idx: number;
+  query_idx: number;
+};
+
 export type RawQueryResult = {
   result: Row[];
 };
diff --git a/src/services/Connections.ts b/src/services/Connections.ts
index 5bb2746..d953ad1 100644
--- a/src/services/Connections.ts
+++ b/src/services/Connections.ts
@@ -10,6 +10,7 @@ import { Store } from "tauri-plugin-store-api";
 import { debounce, firstKey } from "utils/utils";
 import { invoke } from "@tauri-apps/api";
 import { MessageService } from "./Messages";
+import { createSignal } from "solid-js";
 
 const store = new Store(".connections.dat");
 const INTERVAL = 1000;
@@ -133,6 +134,7 @@ export const ConnectionsService = () => {
     tabs: [],
     idx: 0,
   });
+  const [queryIdx, setQueryIdx] = createSignal<number>(0);
 
   const restoreConnectionStore = async () => {
     const conn_tabs: ConnectionStore = await getSavedData(CONNECTIONS_KEY);
@@ -175,7 +177,7 @@ export const ConnectionsService = () => {
       produce((s) => {
         s.tabs.push(tab);
         s.idx = s.tabs.length;
-        s.schema = firstKey(tab.schema)!
+        s.schema = firstKey(tab.schema)!;
       })
     );
     updateStore();
@@ -234,6 +236,7 @@ export const ConnectionsService = () => {
   const setContentIdx = (i: number) => {
     if (i < contentStore.tabs.length) {
       setContentStore("idx", i);
+      setQueryIdx(0);
     }
   };
 
@@ -276,6 +279,14 @@ export const ConnectionsService = () => {
     return _tables;
   };
 
+  const selectPrevQuery = () => {
+    setQueryIdx((s) => (s - 1) % getContentData("Query").result_sets.length);
+  };
+
+  const selectNextQuery = () => {
+    setQueryIdx((s) => (s + 1) % getContentData("Query").result_sets.length);
+  };
+
   return {
     connectionStore,
     setConnectionStore,
@@ -296,5 +307,8 @@ export const ConnectionsService = () => {
     removeContentTab,
     updateConnectionTab,
     getSchemaTables,
+    selectPrevQuery,
+    selectNextQuery,
+    queryIdx,
   };
 };
diff --git a/src/utils/i18n/en.json b/src/utils/i18n/en.json
index be2eb9b..8d60486 100644
--- a/src/utils/i18n/en.json
+++ b/src/utils/i18n/en.json
@@ -6,66 +6,64 @@
       "focus_on": "Focus on",
       "focus_query_text_area": "Focus On Query Text Area"
     },
-    "components": {
-      "add_connection_form": {
-        "title": "Add New Connection",
-        "length_validation": "Must be between 2 and 255 characters",
-        "labels": {
-          "name": "Name",
-          "mode": "Mode",
-          "color": "Color",
-          "scheme": "Scheme",
-          "username": "Username",
-          "password": "Password",
-          "host": "Host",
-          "socket_path": "Socket path",
-          "file": "Database file",
-          "dbname": "Database name",
-          "port": "Port"
-        }
-      },
-      "connections_list": {
-        "actions": {
-          "delete": "Delete",
-          "confirm_action": "Confirm action",
-          "confirm_delete": "Are you sure you want to delete this connection?",
-          "yes": "Yes",
-          "cancel": "Cancel"
-        }
-      },
-      "console": {
-        "query": "Query",
-        "actions": {
-          "format": "Format",
-          "execute": "Execute",
-          "vim_mode_on": "Vim mode on",
-          "copy_query": "Copy query to clipboard",
-          "limit": "LIMIT 1000",
-          "auto_limit": "Apply limit if query does not have one"
-        },
-        "zero_results": "0 rows retuned",
-        "result_set": "Result set ",
-        "out_of": " out of "
-      },
-      "sidebar": {
-        "show_table_structure": "Show table structure",
-        "list_data": "List data",
-        "truncate_table": "Truncate table",
-        "tables": "Tables",
-        "table_was_truncated": "Table {{table}} was truncated"
-      },
-      "theme_switch": {
-        "theme": "Theme"
-      },
-      "file_input": {
-        "choose_file": "Choose file"
-      },
-      "table_structure_tab":{
-        "columns": "Columns",
-        "indices": "Indices",
-        "constraints": "Constraints",
-        "triggers": "Triggers"
+    "add_connection_form": {
+      "title": "Add New Connection",
+      "length_validation": "Must be between 2 and 255 characters",
+      "labels": {
+        "name": "Name",
+        "mode": "Mode",
+        "color": "Color",
+        "scheme": "Scheme",
+        "username": "Username",
+        "password": "Password",
+        "host": "Host",
+        "socket_path": "Socket path",
+        "file": "Database file",
+        "dbname": "Database name",
+        "port": "Port"
+      }
+    },
+    "connections_list": {
+      "actions": {
+        "delete": "Delete",
+        "confirm_action": "Confirm action",
+        "confirm_delete": "Are you sure you want to delete this connection?",
+        "yes": "Yes",
+        "cancel": "Cancel"
       }
+    },
+    "console": {
+      "query": "Query",
+      "actions": {
+        "format": "Format",
+        "execute": "Execute",
+        "vim_mode_on": "Vim mode on",
+        "copy_query": "Copy query to clipboard",
+        "limit": "LIMIT 1000",
+        "auto_limit": "Apply limit if query does not have one"
+      },
+      "zero_results": "0 rows retuned",
+      "result_set": "Result set: ",
+      "out_of": " out of "
+    },
+    "sidebar": {
+      "show_table_structure": "Show table structure",
+      "list_data": "List data",
+      "truncate_table": "Truncate table",
+      "tables": "Tables",
+      "table_was_truncated": "Table {{table}} was truncated"
+    },
+    "theme_switch": {
+      "theme": "Theme"
+    },
+    "file_input": {
+      "choose_file": "Choose file"
+    },
+    "table_structure_tab": {
+      "columns": "Columns",
+      "indices": "Indices",
+      "constraints": "Constraints",
+      "triggers": "Triggers"
     }
   }
 }