diff --git a/src/app.pcss b/src/app.pcss
index 3b0fe0f..9063c96 100644
--- a/src/app.pcss
+++ b/src/app.pcss
@@ -3,4 +3,5 @@
 @tailwind components;
 @tailwind utilities;
 
-body { @apply bg-surface-50-900-token; }
\ No newline at end of file
+body { @apply bg-surface-50-900-token; }
+html, body { @apply min-h-full; }
\ No newline at end of file
diff --git a/src/lib/components/AppSettings.svelte b/src/lib/components/AppSettings.svelte
new file mode 100644
index 0000000..fd8cac7
--- /dev/null
+++ b/src/lib/components/AppSettings.svelte
@@ -0,0 +1,36 @@
+<script>
+    import {RangeSlider, Tab, TabGroup} from "@skeletonlabs/skeleton";
+    import {imageGridColumns, postGridPreviewQuality} from "$lib/stores.js";
+
+    let tabPos = 0;
+</script>
+<div class="flex flex-col">
+    <h2 class="h2 mb-2 text-dark-token">Settings</h2>
+    <TabGroup>
+        <Tab class="text-dark-token" bind:group={tabPos} name="tab1" value={0}>Search Grid</Tab>
+
+        <svelte:fragment slot="panel">
+            {#if tabPos === 0}
+                <div class="flex flex-col gap-3">
+                    <div class="basis-1/2">
+                        <RangeSlider name="grid-columns" min={1} max={12} bind:value={$imageGridColumns} ticked={true}>
+                            <div class="flex flex-grow justify-between items-center">
+                                <div class="text-dark-token font-bold">Grid Columns</div>
+                                <div class="text-xs text-dark-token">{$imageGridColumns} / {12}</div>
+                            </div>
+                        </RangeSlider>
+                    </div>
+                    <div class="basis-1/2">
+                        <label class="label">
+                            <span class="text-dark-token font-bold">Preview type</span>
+                            <select class="select" bind:value={$postGridPreviewQuality}>
+                                <option value="preview">Preview</option>
+                                <option value="sample">Sample</option>
+                            </select>
+                        </label>
+                    </div>
+                </div>
+            {/if}
+        </svelte:fragment>
+    </TabGroup>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/BackAppRailAnchor.svelte b/src/lib/components/BackAppRailAnchor.svelte
index 587a9d7..6c92950 100644
--- a/src/lib/components/BackAppRailAnchor.svelte
+++ b/src/lib/components/BackAppRailAnchor.svelte
@@ -1,12 +1,12 @@
 <script>
-import {faArrowLeft} from "@fortawesome/free-solid-svg-icons";
-import {Fa} from "svelte-fa";
-import {AppRailAnchor} from "@skeletonlabs/skeleton";
+import {faArrowLeft} from '@fortawesome/free-solid-svg-icons';
+import {Fa} from 'svelte-fa';
+import {AppRailAnchor} from '@skeletonlabs/skeleton';
 
 export let popCount = 1;
-
 let href;
 let pathnameParts = window.location.pathname.split('/');
+
 for(let i = 0; i < popCount; i++) {
     pathnameParts.pop();
 }
@@ -23,9 +23,9 @@ switch (pathnameParts.length) {
         break;
 }
 
-console.log(href);
 </script>
-<AppRailAnchor {href} target="_self" title="Back">
+
+<AppRailAnchor {href} title="Back">
     <div class="flex flex-col gap-2 place-content-center">
         <Fa size={'2x'} icon={faArrowLeft} />
         <p>Back</p>
diff --git a/src/lib/components/GlobalSearch.svelte b/src/lib/components/GlobalSearch.svelte
new file mode 100644
index 0000000..0991955
--- /dev/null
+++ b/src/lib/components/GlobalSearch.svelte
@@ -0,0 +1,18 @@
+<script>
+    import { showSearch, lastSearch, loading } from '$lib/stores.js';
+    import { goto } from '$app/navigation';
+
+    let searchValue = $lastSearch;
+</script>
+
+{#if $showSearch}
+    <form class="w-80 pt-2 px-2 flex flex-row gap-2"
+          on:submit|preventDefault={() => {
+              $loading = true;
+              goto('/')
+              lastSearch.set(searchValue);
+          }}>
+        <input class="input py-1 px-2" type="text" placeholder="Search" bind:value={searchValue} />
+        <button class="btn btn-md variant-filled" type="submit">Sumbit</button>
+    </form>
+{/if}
\ No newline at end of file
diff --git a/src/lib/components/ImageGrid.svelte b/src/lib/components/ImageGrid.svelte
index b714a4e..ee7e70f 100644
--- a/src/lib/components/ImageGrid.svelte
+++ b/src/lib/components/ImageGrid.svelte
@@ -1,14 +1,17 @@
 <script>
-    import {imageGridPreviewQuality, imageGridColumns} from '$lib/stores';
+    import {postGridPreviewQuality, imageGridColumns, showSearch, loading} from '$lib/stores';
 
     export let posts = [];
 </script>
 
 <div class="grid gap-3" style={`grid-template-columns: repeat(${$imageGridColumns}, minmax(0, 1fr))`}>
     {#each posts as post}
-        <a href={`/posts/${post.id}`} class="card flex flex-col justify-end items-center">
+        <a href={`/posts/${post.id}`} class="card p-3 flex flex-col justify-end items-center" on:click={() => {
+            $loading = true;
+            $showSearch = false
+        }}>
             <section class="flex">
-                <img src={post[$imageGridPreviewQuality].url}
+                <img src={post[$postGridPreviewQuality].url}
                      loading="lazy"
                      alt={`Post ${post.id}`} />
             </section>
diff --git a/src/lib/components/PostMedia.svelte b/src/lib/components/PostMedia.svelte
new file mode 100644
index 0000000..4c9c818
--- /dev/null
+++ b/src/lib/components/PostMedia.svelte
@@ -0,0 +1,17 @@
+<script>
+    export let post = null;
+</script>
+
+<div>
+    {#if post?.preview?.has}
+        <img class="mb-2" src={post.preview.url} alt={`Post ${post.id}`} />
+    {:else}
+        {#if ['webm', 'mp4'].includes(post.file.ext)}
+            <video class="mb-2" controls playsinline>
+                <source src={post.file.url} />
+            </video>
+        {:else}
+            <img class="mb-2" src={post.file.url} alt={`Post ${post.id}}`} />
+        {/if}
+    {/if}
+</div>
diff --git a/src/lib/components/SearchAppRailAnchor.svelte b/src/lib/components/SearchAppRailAnchor.svelte
new file mode 100644
index 0000000..46f7006
--- /dev/null
+++ b/src/lib/components/SearchAppRailAnchor.svelte
@@ -0,0 +1,13 @@
+<script>
+    import { Fa } from 'svelte-fa';
+    import { AppRailAnchor } from '@skeletonlabs/skeleton';
+    import { showSearch } from '$lib/stores';
+    import { faSearch } from '@fortawesome/free-solid-svg-icons';
+</script>
+
+<AppRailAnchor on:click={() => $showSearch = !$showSearch}>
+    <div class="flex flex-col gap-2 place-content-center">
+        <Fa size={'2x'} icon={faSearch} />
+        <p>Search</p>
+    </div>
+</AppRailAnchor>
diff --git a/src/lib/components/index.js b/src/lib/components/index.js
index 251ee54..cab472f 100644
--- a/src/lib/components/index.js
+++ b/src/lib/components/index.js
@@ -1,5 +1,15 @@
+import AppSettings from './AppSettings.svelte';
+import BackAppRailAnchor from './BackAppRailAnchor.svelte';
+import GlobalSearch from './GlobalSearch.svelte';
 import ImageGrid from './ImageGrid.svelte';
+import PostMedia from './PostMedia.svelte';
+import SearchAppRailAnchor from './SearchAppRailAnchor.svelte';
 
 export {
+    AppSettings,
+    BackAppRailAnchor,
+    GlobalSearch,
     ImageGrid,
+    PostMedia,
+    SearchAppRailAnchor
 }
\ No newline at end of file
diff --git a/src/lib/stores.js b/src/lib/stores.js
index c24f79d..2594b31 100644
--- a/src/lib/stores.js
+++ b/src/lib/stores.js
@@ -2,8 +2,8 @@ import { localStorageStore } from '@skeletonlabs/skeleton';
 import { writable } from 'svelte/store';
 
 export const lastSearch = localStorageStore('lastSearch', '');
-export const imageGridColumns = localStorageStore('gridColumns', 8);
-export const imageSearchResults = writable(null);
-export const imageGridPreviewQuality = localStorageStore('gridPreviewQuality', 'preview');
-
-export const loading = writable(false);
\ No newline at end of file
+export const imageGridColumns = localStorageStore('gridColumns', 6);
+export const postSearchResults = writable(null);
+export const postGridPreviewQuality = localStorageStore('gridPreviewQuality', 'preview');
+export const loading = writable(false);
+export const showSearch = writable(true);
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 36ea83a..af5639a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,14 +1,21 @@
 <script>
     import '../app.pcss';
-    import {initializeStores, ProgressRadial} from '@skeletonlabs/skeleton';
+    import {Drawer, initializeStores, Modal, ProgressRadial} from '@skeletonlabs/skeleton';
     import {loading} from '$lib/stores';
+    import {AppSettings} from '$lib/components';
 
     initializeStores();
 </script>
 
-<div class="relative min-h-dvh">
+<div class="relative h-dvh">
+    <Modal />
+    <Drawer bgDrawer="bg-surface-500/90" width="w-6/12" height="h-dvh" position="left">
+        <div class="h-full p-4">
+            <AppSettings />
+        </div>
+    </Drawer>
     {#if $loading}
-        <div class="fixed inset-x-1/2 top-1 w-8 h-8">
+        <div class="fixed bottom-3 right-3 w-8 h-8">
             <ProgressRadial width="w-8" height="h-8" stroke={120} strokeLinecap="butt"  />
         </div>
     {/if}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 3869138..a491e5a 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,95 +1,70 @@
 <script>
     import { Fa } from 'svelte-fa';
-    import { ImageGrid } from '$lib/components';
+    import {GlobalSearch, ImageGrid, SearchAppRailAnchor} from '$lib/components';
     import { faGear } from '@fortawesome/free-solid-svg-icons';
     import { invoke } from '@tauri-apps/api/tauri'
-    import { lastSearch, imageGridColumns, imageGridPreviewQuality, imageSearchResults, loading } from '$lib/stores';
-    import { onMount } from 'svelte';
+    import { lastSearch, postSearchResults, loading } from '$lib/stores';
     import {
-        AppShell,
-        Drawer,
-        RangeSlider,
-        getDrawerStore,
         AppRail,
         AppRailAnchor,
-        ProgressRadial
+        AppShell,
+        getDrawerStore
     } from '@skeletonlabs/skeleton';
+    import {onMount} from 'svelte';
 
     const drawerStore = getDrawerStore();
 
-    onMount(async () => {
-        if ($imageSearchResults === null) {
-            $loading = true;
-            $imageSearchResults = invoke('get_posts', { query: $lastSearch });
-            $imageSearchResults.then(() => {
-                $loading = false;
-            });
-        }
+    onMount(() => {
+       $loading = false;
     });
 
     function onSearch() {
         $loading = true;
-        $imageSearchResults = invoke('get_posts', { query: $lastSearch });
-        $imageSearchResults.then(() => {
-            $loading = false;
+        invoke('get_posts', { query: $lastSearch }).then((resPosts) => {
+            postSearchResults.set(resPosts);
+            requestAnimationFrame(() => {
+                $loading = false;
+            });
         });
     }
+
+    if ($postSearchResults === null) {
+        onSearch();
+    }
+
+    lastSearch.subscribe(() => {
+        onSearch();
+    })
 </script>
 
-<Drawer bgDrawer="bg-surface-500/90" width="w-6/12" height="h-dvh" position="left">
-    <div class="h-full p-4 flex flex-col justify-between bg-token">
-        <div class="flex flex-row">
-            <label class="label basis-1 flex-grow">
-                <span class="text-dark-token font-bold">Query</span>
-                <input class="input" type="text" bind:value={$lastSearch} />
-            </label>
-            <button class="btn variant-filled flex-shrink" type="button" on:click={() => {onSearch()}}>Search</button>
-        </div>
-        <div class="flex flex-row gap-3">
-            <div class="basis-1/2">
-                <RangeSlider name="grid-columns" min={1} max={12} bind:value={$imageGridColumns} ticked={true}>
-                    <div class="flex flex-grow justify-between items-center">
-                        <div class="text-dark-token font-bold">Grid Columns</div>
-                        <div class="text-xs text-dark-token">{$imageGridColumns} / {12}</div>
-                    </div>
-                </RangeSlider>
-            </div>
-            <div class="basis-1/2">
-                <label class="label">
-                    <span class="text-dark-token font-bold">Preview type</span>
-                    <select class="select" bind:value={$imageGridPreviewQuality}>
-                        <option value="preview">Preview</option>
-                        <option value="sample">Sample</option>
-                    </select>
-                </label>
-            </div>
-        </div>
-    </div>
-</Drawer>
-
 <AppShell>
-    <svelte:fragment slot="sidebarLeft">
-        <AppRail height="h-dvh">
-            <svelte:fragment slot="trail">
-                <AppRailAnchor on:click={() => drawerStore.open()}>
-                    <div class="flex flex-col gap-2 place-content-center">
-                        <Fa size={'2x'} icon={faGear} />
-                        <p>Settings</p>
-                    </div>
-                </AppRailAnchor>
-            </svelte:fragment>
-        </AppRail>
+    <svelte:fragment slot="pageHeader">
+        <GlobalSearch />
     </svelte:fragment>
+
+    <svelte:fragment slot="sidebarLeft">
+        <div class="h-dvh">
+            <AppRail>
+                <svelte:fragment slot="lead">
+                    <SearchAppRailAnchor />
+                </svelte:fragment>
+                <svelte:fragment slot="trail">
+                    <AppRailAnchor on:click={() => drawerStore.open()}>
+                        <div class="flex flex-col gap-2 place-content-center">
+                            <Fa size={'2x'} icon={faGear} />
+                            <p>Settings</p>
+                        </div>
+                    </AppRailAnchor>
+                </svelte:fragment>
+            </AppRail>
+        </div>
+    </svelte:fragment>
+
     <svelte:fragment>
-        <div class="max-h-dvh p-2">
-            {#if $imageSearchResults}
-                {#await $imageSearchResults}
-                {:then result}
-                    <ImageGrid posts={result} />
-                {:catch err}
-                    <p>Error: {err}</p>
-                {/await}
+        <div class="overflow-scroll p-2">
+            {#if $postSearchResults}
+                <ImageGrid posts={$postSearchResults} />
             {/if}
         </div>
     </svelte:fragment>
-</AppShell>
+</AppShell>
\ No newline at end of file
diff --git a/src/routes/posts/[post_id]/+page.svelte b/src/routes/posts/[post_id]/+page.svelte
index 7662312..6926d2a 100644
--- a/src/routes/posts/[post_id]/+page.svelte
+++ b/src/routes/posts/[post_id]/+page.svelte
@@ -3,19 +3,16 @@
         AppRail,
         AppRailAnchor,
         AppShell,
-        Modal,
         getDrawerStore,
-        getModalStore,
-        Drawer
     } from '@skeletonlabs/skeleton';
-    import {faCode, faGear} from '@fortawesome/free-solid-svg-icons';
+    import { faGear, faCopy } from '@fortawesome/free-solid-svg-icons';
     import { Fa } from 'svelte-fa';
-    import BackAppRailAnchor from "$lib/components/BackAppRailAnchor.svelte";
+    import { BackAppRailAnchor, GlobalSearch, PostMedia, SearchAppRailAnchor } from '$lib/components';
+    import {onMount} from 'svelte';
+    import {loading} from '$lib/stores.js';
+
     export let data;
-
     let drawerStore = getDrawerStore();
-    let modalStore = getModalStore();
-
     const tagTypes = Object.entries({
         artist: 'Artist',
         character: 'Character',
@@ -25,13 +22,17 @@
         meta: 'Meta',
         invalid: 'Invalid'
     });
+
+    onMount(() => {
+        $loading = false;
+    });
 </script>
 
-<Modal />
-<Drawer>
-
-</Drawer>
 <AppShell>
+    <svelte:fragment slot="pageHeader">
+        <GlobalSearch />
+    </svelte:fragment>
+
     <svelte:fragment slot="sidebarRight">
         <div class="p-2 h-dvh">
             {#each tagTypes as [name, label]}
@@ -44,35 +45,36 @@
             {/each}
         </div>
     </svelte:fragment>
+
     <svelte:fragment slot="sidebarLeft">
-        <AppRail height="h-dvh">
-            <svelte:fragment slot="lead">
-                <BackAppRailAnchor popCount={2} />
-            </svelte:fragment>
-            <svelte:fragment slot="trail">
-                <!-- <AppRailAnchor on:click={() => modalStore.trigger({body: JSON.stringify(data.post, null, 2)})}>
-                    <div class="flex flex-col gap-2 place-content-center">
-                        <Fa size={'2x'} icon={faCode} />
-                        <p>Post data</p>
-                    </div>
-                </AppRailAnchor> -->
-                <AppRailAnchor on:click={() => drawerStore.open()}>
-                    <div class="flex flex-col gap-2 place-content-center">
-                        <Fa size={'2x'} icon={faGear} />
-                        <p>Settings</p>
-                    </div>
-                </AppRailAnchor>
-            </svelte:fragment>
-        </AppRail>
+        <div class="h-dvh">
+            <AppRail>
+                <svelte:fragment slot="lead">
+                    <BackAppRailAnchor popCount={2} />
+                    <SearchAppRailAnchor />
+                </svelte:fragment>
+                <svelte:fragment slot="trail">
+                    <AppRailAnchor on:click={() => {}}>
+                        <div class="flex flex-col gap-2 place-content-center">
+                            <Fa size={'2x'} icon={faCopy} />
+                            <p>Copy link</p>
+                        </div>
+                    </AppRailAnchor>
+                    <AppRailAnchor on:click={() => drawerStore.open()}>
+                        <div class="flex flex-col gap-2 place-content-center">
+                            <Fa size={'2x'} icon={faGear} />
+                            <p>Settings</p>
+                        </div>
+                    </AppRailAnchor>
+                </svelte:fragment>
+            </AppRail>
+        </div>
     </svelte:fragment>
+
     <svelte:fragment slot="default">
-        <div class="max-h-dvh container mx-auto p-2">
+        <div class="container mx-auto p-2">
             <div class="flex flex-row place-content-center">
-                {#if data?.post?.preview?.has}
-                    <img class="mb-2" src={data.post.preview.url} alt={`Post ${data.post.id}`} />
-                {:else}
-                    <img class="mb-2" src={data.post.file.url} alt={`Post ${data.post.id}}`} />
-                {/if}
+                <PostMedia post={data.post} />
             </div>
             <div class="card">
                 <header class="px-3 pt-2">
@@ -82,11 +84,6 @@
                     <p>{data.post.description}</p>
                 </section>
             </div>
-            <!-- <div>
-                <pre>
-                    {JSON.stringify(data, null, 2)}
-                </pre>
-            </div>-->
         </div>
     </svelte:fragment>
 </AppShell>