diff --git a/package-lock.json b/package-lock.json
index 6338058..4097658 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
         "@radix-ui/react-separator": "^1.1.1",
         "@radix-ui/react-slot": "^1.1.1",
         "@radix-ui/react-switch": "^1.1.2",
+        "@radix-ui/react-tabs": "^1.1.2",
         "@radix-ui/react-toast": "^1.2.4",
         "blurhash": "^2.0.5",
         "class-variance-authority": "^0.7.1",
@@ -3088,6 +3089,35 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-tabs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.2.tgz",
+      "integrity": "sha512-9u/tQJMcC2aGq7KXpGivMm1mgq7oRJKXphDwdypPd/j21j/2znamPU8WkXgnhUaTrSFNIt8XhOyCAupg8/GbwQ==",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-roving-focus": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-toast": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.4.tgz",
diff --git a/package.json b/package.json
index 3a37ad5..995919d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "@radix-ui/react-separator": "^1.1.1",
     "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-switch": "^1.1.2",
+    "@radix-ui/react-tabs": "^1.1.2",
     "@radix-ui/react-toast": "^1.2.4",
     "blurhash": "^2.0.5",
     "class-variance-authority": "^0.7.1",
diff --git a/src/components/ImageGallery/index.tsx b/src/components/ImageGallery/index.tsx
index 1ed375d..d84b4ba 100644
--- a/src/components/ImageGallery/index.tsx
+++ b/src/components/ImageGallery/index.tsx
@@ -2,6 +2,7 @@ import { cn } from '@/lib/utils'
 import { useScreenSize } from '@/providers/ScreenSizeProvider'
 import { TImageInfo } from '@/types'
 import { ReactNode, useState } from 'react'
+import { createPortal } from 'react-dom'
 import Lightbox from 'yet-another-react-lightbox'
 import Zoom from 'yet-another-react-lightbox/plugins/zoom'
 import Image from '../Image'
@@ -81,21 +82,27 @@ export default function ImageGallery({
   return (
     <div className={cn('relative w-fit max-w-full', className)}>
       {imageContent}
-      <div onClick={(e) => e.stopPropagation()}>
-        <Lightbox
-          index={index}
-          slides={images.map(({ url }) => ({ src: url }))}
-          plugins={[Zoom]}
-          open={index >= 0}
-          close={() => setIndex(-1)}
-          controller={{
-            closeOnBackdropClick: true,
-            closeOnPullUp: true,
-            closeOnPullDown: true
-          }}
-          styles={{ toolbar: { paddingTop: '2.25rem' } }}
-        />
-      </div>
+      {index >= 0 &&
+        createPortal(
+          <div onClick={(e) => e.stopPropagation()}>
+            <Lightbox
+              index={index}
+              slides={images.map(({ url }) => ({ src: url }))}
+              plugins={[Zoom]}
+              open={index >= 0}
+              close={() => setIndex(-1)}
+              controller={{
+                closeOnBackdropClick: true,
+                closeOnPullUp: true,
+                closeOnPullDown: true
+              }}
+              styles={{
+                toolbar: { paddingTop: '2.25rem' }
+              }}
+            />
+          </div>,
+          document.body
+        )}
       {isNsfw && <NsfwOverlay className="rounded-lg" />}
     </div>
   )
diff --git a/src/components/PictureNoteCard/index.tsx b/src/components/PictureNoteCard/index.tsx
index b810d75..5987a08 100644
--- a/src/components/PictureNoteCard/index.tsx
+++ b/src/components/PictureNoteCard/index.tsx
@@ -1,11 +1,9 @@
 import { extractFirstPictureFromPictureEvent } from '@/lib/event'
 import { toNote } from '@/lib/link'
+import { tagNameEquals } from '@/lib/tag'
 import { cn } from '@/lib/utils'
 import { useSecondaryPage } from '@/PageManager'
 import { Event } from 'nostr-tools'
-import Image from '../Image'
-import UserAvatar from '../UserAvatar'
-import Username from '../Username'
 import { useMemo } from 'react'
 import {
   embedded,
@@ -13,6 +11,9 @@ import {
   embeddedNostrNpubRenderer,
   embeddedNostrProfileRenderer
 } from '../Embedded'
+import Image from '../Image'
+import UserAvatar from '../UserAvatar'
+import Username from '../Username'
 
 export default function PictureNoteCard({
   event,
@@ -23,21 +24,20 @@ export default function PictureNoteCard({
 }) {
   const { push } = useSecondaryPage()
   const firstImage = extractFirstPictureFromPictureEvent(event)
-  const content = useMemo(
-    () =>
-      embedded(event.content, [
-        embeddedNostrNpubRenderer,
-        embeddedNostrProfileRenderer,
-        embeddedHashtagRenderer
-      ]),
-    [event]
-  )
+  const title = useMemo(() => {
+    const title = event.tags.find(tagNameEquals('title'))?.[1] ?? event.content
+    return embedded(title, [
+      embeddedNostrNpubRenderer,
+      embeddedNostrProfileRenderer,
+      embeddedHashtagRenderer
+    ])
+  }, [event])
   if (!firstImage) return null
 
   return (
     <div className={cn('space-y-1 cursor-pointer', className)} onClick={() => push(toNote(event))}>
       <Image className="rounded-lg w-full aspect-[6/8]" image={firstImage} />
-      <div className="line-clamp-2 px-2">{content}</div>
+      <div className="line-clamp-2 px-2">{title}</div>
       <div className="flex items-center gap-2 px-2">
         <UserAvatar userId={event.pubkey} size="xSmall" />
         <Username userId={event.pubkey} className="text-sm text-muted-foreground truncate" />
diff --git a/src/components/PostEditor/PostContent.tsx b/src/components/PostEditor/NormalPostContent.tsx
similarity index 77%
rename from src/components/PostEditor/PostContent.tsx
rename to src/components/PostEditor/NormalPostContent.tsx
index 0dcc1ba..001b3fd 100644
--- a/src/components/PostEditor/PostContent.tsx
+++ b/src/components/PostEditor/NormalPostContent.tsx
@@ -4,12 +4,7 @@ import { Switch } from '@/components/ui/switch'
 import { Textarea } from '@/components/ui/textarea'
 import { StorageKey } from '@/constants'
 import { useToast } from '@/hooks/use-toast'
-import {
-  createCommentDraftEvent,
-  createPictureNoteDraftEvent,
-  createShortTextNoteDraftEvent
-} from '@/lib/draft-event'
-import { extractImagesFromContent } from '@/lib/event'
+import { createCommentDraftEvent, createShortTextNoteDraftEvent } from '@/lib/draft-event'
 import { useNostr } from '@/providers/NostrProvider'
 import client from '@/services/client.service'
 import { ChevronDown, LoaderCircle } from 'lucide-react'
@@ -20,7 +15,7 @@ import Mentions from './Mentions'
 import Preview from './Preview'
 import Uploader from './Uploader'
 
-export default function PostContent({
+export default function NormalPostContent({
   defaultContent = '',
   parentEvent,
   close
@@ -37,19 +32,12 @@ export default function PostContent({
   const [posting, setPosting] = useState(false)
   const [showMoreOptions, setShowMoreOptions] = useState(false)
   const [addClientTag, setAddClientTag] = useState(false)
-  const [isPictureNote, setIsPictureNote] = useState(false)
-  const [hasImages, setHasImages] = useState(false)
   const canPost = !!content && !posting
 
   useEffect(() => {
     setAddClientTag(window.localStorage.getItem(StorageKey.ADD_CLIENT_TAG) === 'true')
   }, [])
 
-  useEffect(() => {
-    const { images } = extractImagesFromContent(content)
-    setHasImages(!!images && images.length > 0)
-  }, [content])
-
   const handleTextareaChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
     setContent(e.target.value)
   }
@@ -69,18 +57,13 @@ export default function PostContent({
           const relayList = await client.fetchRelayList(parentEvent.pubkey)
           additionalRelayUrls.push(...relayList.read.slice(0, 5))
         }
-        if (isPictureNote && !hasImages) {
-          throw new Error(t('Picture note requires images'))
-        }
         const draftEvent =
-          isPictureNote && !parentEvent && hasImages
-            ? await createPictureNoteDraftEvent(content, pictureInfos, { addClientTag })
-            : parentEvent && parentEvent.kind !== kinds.ShortTextNote
-              ? await createCommentDraftEvent(content, parentEvent, pictureInfos, { addClientTag })
-              : await createShortTextNoteDraftEvent(content, pictureInfos, {
-                  parentEvent,
-                  addClientTag
-                })
+          parentEvent && parentEvent.kind !== kinds.ShortTextNote
+            ? await createCommentDraftEvent(content, parentEvent, pictureInfos, { addClientTag })
+            : await createShortTextNoteDraftEvent(content, pictureInfos, {
+                parentEvent,
+                addClientTag
+              })
         await publish(draftEvent, additionalRelayUrls)
         setContent('')
         close()
@@ -177,21 +160,6 @@ export default function PostContent({
           <div className="text-muted-foreground text-xs">
             {t('Show others this was sent via Jumble')}
           </div>
-          {!parentEvent && (
-            <>
-              <div className="flex items-center space-x-2">
-                <Label htmlFor="picture-note">{t('Picture note')}</Label>
-                <Switch
-                  id="picture-note"
-                  checked={isPictureNote}
-                  onCheckedChange={setIsPictureNote}
-                />
-              </div>
-              <div className="text-muted-foreground text-xs">
-                {t('A special note for picture-first clients like Olas')}
-              </div>
-            </>
-          )}
         </div>
       )}
       <div className="flex gap-2 items-center justify-around sm:hidden">
diff --git a/src/components/PostEditor/PicturePostContent.tsx b/src/components/PostEditor/PicturePostContent.tsx
new file mode 100644
index 0000000..b382c3c
--- /dev/null
+++ b/src/components/PostEditor/PicturePostContent.tsx
@@ -0,0 +1,233 @@
+import { Button } from '@/components/ui/button'
+import { Label } from '@/components/ui/label'
+import { Switch } from '@/components/ui/switch'
+import { Textarea } from '@/components/ui/textarea'
+import { StorageKey } from '@/constants'
+import { useToast } from '@/hooks/use-toast'
+import { createPictureNoteDraftEvent } from '@/lib/draft-event'
+import { useNostr } from '@/providers/NostrProvider'
+import { ChevronDown, LoaderCircle, X } from 'lucide-react'
+import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { useTranslation } from 'react-i18next'
+import Lightbox from 'yet-another-react-lightbox'
+import Zoom from 'yet-another-react-lightbox/plugins/zoom'
+import Image from '../Image'
+import Mentions from './Mentions'
+import Uploader from './Uploader'
+
+export default function PicturePostContent({ close }: { close: () => void }) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const { publish, checkLogin } = useNostr()
+  const [content, setContent] = useState('')
+  const [pictureInfos, setPictureInfos] = useState<{ url: string; tags: string[][] }[]>([])
+  const [posting, setPosting] = useState(false)
+  const [showMoreOptions, setShowMoreOptions] = useState(false)
+  const [addClientTag, setAddClientTag] = useState(false)
+  const canPost = !!content && !posting && pictureInfos.length > 0
+
+  useEffect(() => {
+    setAddClientTag(window.localStorage.getItem(StorageKey.ADD_CLIENT_TAG) === 'true')
+  }, [])
+
+  const handleTextareaChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setContent(e.target.value)
+  }
+
+  const post = async (e: React.MouseEvent) => {
+    e.stopPropagation()
+    checkLogin(async () => {
+      if (!canPost) {
+        close()
+        return
+      }
+
+      setPosting(true)
+      try {
+        if (!pictureInfos.length) {
+          throw new Error(t('Picture note requires images'))
+        }
+        const draftEvent = await createPictureNoteDraftEvent(content, pictureInfos, {
+          addClientTag
+        })
+        await publish(draftEvent)
+        setContent('')
+        close()
+      } catch (error) {
+        if (error instanceof AggregateError) {
+          error.errors.forEach((e) =>
+            toast({
+              variant: 'destructive',
+              title: t('Failed to post'),
+              description: e.message
+            })
+          )
+        } else if (error instanceof Error) {
+          toast({
+            variant: 'destructive',
+            title: t('Failed to post'),
+            description: error.message
+          })
+        }
+        console.error(error)
+        return
+      } finally {
+        setPosting(false)
+      }
+      toast({
+        title: t('Post successful'),
+        description: t('Your post has been published')
+      })
+    })
+  }
+
+  const onAddClientTagChange = (checked: boolean) => {
+    setAddClientTag(checked)
+    window.localStorage.setItem(StorageKey.ADD_CLIENT_TAG, checked.toString())
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="text-xs text-muted-foreground">
+        {t('A special note for picture-first clients like Olas')}
+      </div>
+      <PictureUploader pictureInfos={pictureInfos} setPictureInfos={setPictureInfos} />
+      <Textarea
+        className="h-32"
+        onChange={handleTextareaChange}
+        value={content}
+        placeholder={t('Write something...')}
+      />
+      <div className="flex items-center justify-between">
+        <Button
+          variant="link"
+          className="text-foreground gap-0 px-0"
+          onClick={() => setShowMoreOptions((pre) => !pre)}
+        >
+          {t('More options')}
+          <ChevronDown className={`transition-transform ${showMoreOptions ? 'rotate-180' : ''}`} />
+        </Button>
+        <div className="flex gap-2 items-center">
+          <Mentions content={content} />
+          <div className="flex gap-2 items-center max-sm:hidden">
+            <Button
+              variant="secondary"
+              onClick={(e) => {
+                e.stopPropagation()
+                close()
+              }}
+            >
+              {t('Cancel')}
+            </Button>
+            <Button type="submit" disabled={!canPost} onClick={post}>
+              {posting && <LoaderCircle className="animate-spin" />}
+              {t('Post')}
+            </Button>
+          </div>
+        </div>
+      </div>
+      {showMoreOptions && (
+        <div className="space-y-2">
+          <div className="flex items-center space-x-2">
+            <Label htmlFor="add-client-tag">{t('Add client tag')}</Label>
+            <Switch
+              id="add-client-tag"
+              checked={addClientTag}
+              onCheckedChange={onAddClientTagChange}
+            />
+          </div>
+          <div className="text-muted-foreground text-xs">
+            {t('Show others this was sent via Jumble')}
+          </div>
+        </div>
+      )}
+      <div className="flex gap-2 items-center justify-around sm:hidden">
+        <Button
+          className="w-full"
+          variant="secondary"
+          onClick={(e) => {
+            e.stopPropagation()
+            close()
+          }}
+        >
+          {t('Cancel')}
+        </Button>
+        <Button className="w-full" type="submit" disabled={!canPost} onClick={post}>
+          {posting && <LoaderCircle className="animate-spin" />}
+          {t('Post')}
+        </Button>
+      </div>
+    </div>
+  )
+}
+
+function PictureUploader({
+  pictureInfos,
+  setPictureInfos
+}: {
+  pictureInfos: { url: string; tags: string[][] }[]
+  setPictureInfos: Dispatch<
+    SetStateAction<
+      {
+        url: string
+        tags: string[][]
+      }[]
+    >
+  >
+}) {
+  const [index, setIndex] = useState(-1)
+
+  return (
+    <>
+      <div className="grid grid-cols-3 gap-4">
+        {pictureInfos.map(({ url }, index) => (
+          <div className="relative" key={`${index}-${url}`}>
+            <Image
+              image={{ url }}
+              className="aspect-square w-full rounded-lg"
+              onClick={(e) => {
+                e.stopPropagation()
+                setIndex(index)
+              }}
+            />
+            <Button
+              variant="destructive"
+              className="absolute top-0 right-0 translate-x-1/2 -translate-y-1/2 rounded-full w-6 h-6 p-0"
+              onClick={() => {
+                setPictureInfos((prev) => prev.filter((_, i) => i !== index))
+              }}
+            >
+              <X />
+            </Button>
+          </div>
+        ))}
+        <Uploader
+          variant="big"
+          onUploadSuccess={({ url, tags }) => {
+            setPictureInfos((prev) => [...prev, { url, tags }])
+          }}
+        />
+      </div>
+      {index >= 0 &&
+        createPortal(
+          <div onClick={(e) => e.stopPropagation()}>
+            <Lightbox
+              index={index}
+              slides={pictureInfos.map(({ url }) => ({ src: url }))}
+              plugins={[Zoom]}
+              open={index >= 0}
+              close={() => setIndex(-1)}
+              controller={{
+                closeOnBackdropClick: true,
+                closeOnPullUp: true,
+                closeOnPullDown: true
+              }}
+              styles={{ toolbar: { paddingTop: '2.25rem' } }}
+            />
+          </div>,
+          document.body
+        )}
+    </>
+  )
+}
diff --git a/src/components/PostEditor/Uploader.tsx b/src/components/PostEditor/Uploader.tsx
index 66e2a6f..28580c3 100644
--- a/src/components/PostEditor/Uploader.tsx
+++ b/src/components/PostEditor/Uploader.tsx
@@ -1,14 +1,17 @@
 import { Button } from '@/components/ui/button'
 import { useToast } from '@/hooks/use-toast'
+import { cn } from '@/lib/utils'
 import { useNostr } from '@/providers/NostrProvider'
-import { ImageUp, LoaderCircle } from 'lucide-react'
+import { ImageUp, Loader, LoaderCircle, Plus } from 'lucide-react'
 import { useRef, useState } from 'react'
 import { z } from 'zod'
 
 export default function Uploader({
-  onUploadSuccess
+  onUploadSuccess,
+  variant = 'button'
 }: {
   onUploadSuccess: ({ url, tags }: { url: string; tags: string[][] }) => void
+  variant?: 'button' | 'big'
 }) {
   const [uploading, setUploading] = useState(false)
   const { signHttpAuth } = useNostr()
@@ -62,20 +65,46 @@ export default function Uploader({
   }
 
   const handleUploadClick = () => {
-    fileInputRef.current?.click()
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '' // clear the value so that the same file can be uploaded again
+      fileInputRef.current.click()
+    }
+  }
+
+  if (variant === 'button') {
+    return (
+      <>
+        <Button variant="secondary" onClick={handleUploadClick} disabled={uploading}>
+          {uploading ? <LoaderCircle className="animate-spin" /> : <ImageUp />}
+        </Button>
+        <input
+          type="file"
+          ref={fileInputRef}
+          style={{ display: 'none' }}
+          onChange={handleFileChange}
+          accept="image/*,video/*,audio/*"
+        />
+      </>
+    )
   }
 
   return (
     <>
-      <Button variant="secondary" onClick={handleUploadClick} disabled={uploading}>
-        {uploading ? <LoaderCircle className="animate-spin" /> : <ImageUp />}
-      </Button>
+      <div
+        className={cn(
+          'flex flex-col gap-2 items-center justify-center aspect-square w-full rounded-lg border border-dashed',
+          uploading ? 'cursor-not-allowed text-muted-foreground' : 'clickable'
+        )}
+        onClick={handleUploadClick}
+      >
+        {uploading ? <Loader size={36} className="animate-spin" /> : <Plus size={36} />}
+      </div>
       <input
         type="file"
         ref={fileInputRef}
         style={{ display: 'none' }}
         onChange={handleFileChange}
-        accept="image/*,video/*,audio/*"
+        accept="image/*"
       />
     </>
   )
diff --git a/src/components/PostEditor/index.tsx b/src/components/PostEditor/index.tsx
index 67b5fa4..3558333 100644
--- a/src/components/PostEditor/index.tsx
+++ b/src/components/PostEditor/index.tsx
@@ -5,19 +5,16 @@ import {
   DialogHeader,
   DialogTitle
 } from '@/components/ui/dialog'
-import {
-  Drawer,
-  DrawerContent,
-  DrawerDescription,
-  DrawerHeader,
-  DrawerTitle
-} from '@/components/ui/drawer'
 import { ScrollArea } from '@/components/ui/scroll-area'
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { useScreenSize } from '@/providers/ScreenSizeProvider'
 import { Event } from 'nostr-tools'
-import { Dispatch } from 'react'
-import PostContent from './PostContent'
+import { Dispatch, useMemo } from 'react'
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from '../ui/sheet'
+import NormalPostContent from './NormalPostContent'
+import PicturePostContent from './PicturePostContent'
 import Title from './Title'
+import { useTranslation } from 'react-i18next'
 
 export default function PostEditor({
   defaultContent = '',
@@ -30,32 +27,58 @@ export default function PostEditor({
   open: boolean
   setOpen: Dispatch<boolean>
 }) {
+  const { t } = useTranslation()
   const { isSmallScreen } = useScreenSize()
 
+  const content = useMemo(() => {
+    return parentEvent ? (
+      <NormalPostContent
+        defaultContent={defaultContent}
+        parentEvent={parentEvent}
+        close={() => setOpen(false)}
+      />
+    ) : (
+      <Tabs defaultValue="normal" className="space-y-4">
+        <TabsList>
+          <TabsTrigger value="normal">{t('Normal Post')}</TabsTrigger>
+          <TabsTrigger value="picture">{t('Picture Post')}</TabsTrigger>
+        </TabsList>
+        <TabsContent value="normal">
+          <NormalPostContent
+            defaultContent={defaultContent}
+            parentEvent={parentEvent}
+            close={() => setOpen(false)}
+          />
+        </TabsContent>
+        <TabsContent value="picture">
+          <PicturePostContent close={() => setOpen(false)} />
+        </TabsContent>
+      </Tabs>
+    )
+  }, [parentEvent])
+
   if (isSmallScreen) {
     return (
-      <Drawer open={open} onOpenChange={setOpen}>
-        <DrawerContent className="h-full">
-          <DrawerHeader>
-            <DrawerTitle className="text-start">
-              <Title parentEvent={parentEvent} />
-            </DrawerTitle>
-            <DrawerDescription className="hidden" />
-          </DrawerHeader>
-          <div className="overflow-auto py-2 px-4">
-            <PostContent
-              defaultContent={defaultContent}
-              parentEvent={parentEvent}
-              close={() => setOpen(false)}
-            />
-          </div>
-        </DrawerContent>
-      </Drawer>
+      <Sheet open={open} onOpenChange={setOpen} modal={false}>
+        <SheetContent className="h-full w-full p-0 border-none" side="bottom" hideClose>
+          <ScrollArea className="px-4 h-full max-h-screen">
+            <div className="space-y-4 px-2 py-6">
+              <SheetHeader>
+                <SheetTitle className="text-start">
+                  <Title parentEvent={parentEvent} />
+                </SheetTitle>
+                <SheetDescription className="hidden" />
+              </SheetHeader>
+              {content}
+            </div>
+          </ScrollArea>
+        </SheetContent>
+      </Sheet>
     )
   }
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog open={open} onOpenChange={setOpen} modal={false}>
       <DialogContent className="p-0" withoutClose>
         <ScrollArea className="px-4 h-full max-h-screen">
           <div className="space-y-4 px-2 py-6">
@@ -65,11 +88,7 @@ export default function PostEditor({
               </DialogTitle>
               <DialogDescription className="hidden" />
             </DialogHeader>
-            <PostContent
-              defaultContent={defaultContent}
-              parentEvent={parentEvent}
-              close={() => setOpen(false)}
-            />
+            {content}
           </div>
         </ScrollArea>
       </DialogContent>
diff --git a/src/components/Sidebar/PostButton.tsx b/src/components/Sidebar/PostButton.tsx
index 19dcdf0..a92e43d 100644
--- a/src/components/Sidebar/PostButton.tsx
+++ b/src/components/Sidebar/PostButton.tsx
@@ -7,7 +7,7 @@ export default function PostButton() {
   const [open, setOpen] = useState(false)
 
   return (
-    <>
+    <div className="pt-4">
       <SidebarItem
         title="New post"
         description="Post"
@@ -16,11 +16,11 @@ export default function PostButton() {
           setOpen(true)
         }}
         variant="default"
-        className="bg-primary"
+        className="bg-primary xl:justify-center"
       >
         <PencilLine strokeWidth={3} />
       </SidebarItem>
       <PostEditor open={open} setOpen={setOpen} />
-    </>
+    </div>
   )
 }
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 353b546..db188d7 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -32,7 +32,8 @@ const DialogContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { withoutClose?: boolean }
 >(({ className, children, withoutClose, ...props }, ref) => (
   <DialogPortal>
-    <DialogOverlay />
+    {/* <DialogOverlay /> */}
+    <div className="fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0" />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index af39974..7e9016a 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -53,15 +53,17 @@ interface SheetContentProps
 
 const SheetContent = React.forwardRef<
   React.ElementRef<typeof SheetPrimitive.Content>,
-  SheetContentProps
->(({ side = 'right', className, children, ...props }, ref) => (
+  SheetContentProps & { hideClose?: boolean }
+>(({ side = 'right', className, children, hideClose = false, ...props }, ref) => (
   <SheetPortal>
     <SheetOverlay />
     <SheetPrimitive.Content ref={ref} className={cn(sheetVariants({ side }), className)} {...props}>
-      <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
-        <X className="h-4 w-4" />
-        <span className="sr-only">Close</span>
-      </SheetPrimitive.Close>
+      {!hideClose && (
+        <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+          <X className="h-4 w-4" />
+          <span className="sr-only">Close</span>
+        </SheetPrimitive.Close>
+      )}
       {children}
     </SheetPrimitive.Content>
   </SheetPortal>
diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx
new file mode 100644
index 0000000..85d83be
--- /dev/null
+++ b/src/components/ui/tabs.tsx
@@ -0,0 +1,53 @@
+import * as React from "react"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "@/lib/utils"
+
+const Tabs = TabsPrimitive.Root
+
+const TabsList = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.List>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.List
+    ref={ref}
+    className={cn(
+      "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
+      className
+    )}
+    {...props}
+  />
+))
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
+      className
+    )}
+    {...props}
+  />
+))
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Content
+    ref={ref}
+    className={cn(
+      "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+      className
+    )}
+    {...props}
+  />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 8fb39a2..28a7483 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -105,6 +105,8 @@ export default {
       'A special note for picture-first clients like Olas',
     'Picture note requires images': 'Picture note requires images',
     Relays: 'Relays',
-    image: 'image'
+    image: 'image',
+    'Normal Post': 'Normal Post',
+    'Picture Post': 'Picture Post'
   }
 }
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index ab774b6..df2a13a 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -104,6 +104,9 @@ export default {
       '一种可以在图片优先客户端 (如 Olas) 中显示的特殊笔记',
     'Picture note requires images': '图片笔记需要有图片',
     Relays: '服务器',
-    image: '图片'
+    image: '图片',
+    Normal: '普通',
+    'Normal Post': '普通笔记',
+    'Picture Post': '图片笔记'
   }
 }