diff --git a/apps/api/app/api/v1/markets/route.ts b/apps/api/app/api/v1/markets/route.ts
index b0fe565a..b8223db4 100644
--- a/apps/api/app/api/v1/markets/route.ts
+++ b/apps/api/app/api/v1/markets/route.ts
@@ -29,6 +29,8 @@ export async function GET(req: Request): Promise<SchemaResponse<typeof schema.ge
   }
 }
 
+export const maxDuration = 60 // Extend max duration for creating lists with lots of markets.
+
 export async function POST(req: Request): Promise<SchemaResponse<typeof schema.post.responses>> {
   try {
     const userId = await getAuthUser(req)
diff --git a/packages/api-helpers/client/index.ts b/packages/api-helpers/client/index.ts
index baa7c80d..30b20c2e 100644
--- a/packages/api-helpers/client/index.ts
+++ b/packages/api-helpers/client/index.ts
@@ -250,6 +250,13 @@ export async function updateMarket({ marketId, body }: { marketId: string; body:
   })
 }
 
+export async function updateList({ listId, body }: { listId: string; body: Record<string, unknown> }) {
+  return apiHandler<{ data: Market }>(`${process.env.NEXT_PUBLIC_API_URL}/v1/lists/${listId}`, {
+    method: 'PATCH',
+    body: body,
+  })
+}
+
 export async function updateMarketOption({
   marketId,
   optionId,
diff --git a/packages/lists/components/EditListDialog.tsx b/packages/lists/components/EditListDialog.tsx
new file mode 100644
index 00000000..95906ad4
--- /dev/null
+++ b/packages/lists/components/EditListDialog.tsx
@@ -0,0 +1,154 @@
+'use client'
+
+import { zodResolver } from '@hookform/resolvers/zod'
+import React from 'react'
+import { useForm } from 'react-hook-form'
+import z from 'zod'
+import { updateList } from '@play-money/api-helpers/client'
+import { List, ListSchema } from '@play-money/database'
+import { Button } from '@play-money/ui/button'
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@play-money/ui/dialog'
+import { Editor } from '@play-money/ui/editor'
+import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@play-money/ui/form'
+import { Input } from '@play-money/ui/input'
+import { MultiSelect } from '@play-money/ui/multi-select'
+import { toast } from '@play-money/ui/use-toast'
+
+const FormSchema = ListSchema.pick({ title: true, description: true, tags: true })
+
+type FormData = z.infer<typeof FormSchema>
+
+// Copied from https://github.com/orgs/react-hook-form/discussions/1991
+function getDirtyValues<DirtyFields extends Record<string, unknown>, Values extends Record<keyof DirtyFields, unknown>>(
+  dirtyFields: DirtyFields,
+  values: Values
+): Partial<typeof values> {
+  const dirtyValues = Object.keys(dirtyFields).reduce((prev, key) => {
+    if (!dirtyFields[key]) return prev
+
+    return {
+      ...prev,
+      [key]:
+        typeof dirtyFields[key] === 'object'
+          ? getDirtyValues(dirtyFields[key] as DirtyFields, values[key] as Values)
+          : values[key],
+    }
+  }, {})
+
+  return dirtyValues
+}
+
+export const EditListDialog = ({
+  open,
+  onClose,
+  onSuccess,
+  list,
+}: {
+  open: boolean
+  onClose: () => void
+  onSuccess?: () => void
+  list: List
+}) => {
+  const form = useForm<FormData>({
+    resolver: zodResolver(FormSchema),
+    defaultValues: {
+      title: list.title,
+      description: list.description ?? '<p></p>',
+      tags: list.tags,
+    },
+  })
+
+  const {
+    formState: { isSubmitting, isDirty, isValid },
+  } = form
+
+  const onSubmit = async (data: FormData) => {
+    try {
+      const changedData = getDirtyValues(form.formState.dirtyFields, data)
+      await updateList({ listId: list.id, body: changedData })
+      toast({ title: 'List edited successfully' })
+      form.reset()
+      onSuccess?.()
+      onClose()
+    } catch (error: any) {
+      console.error('Failed to edit list:', error)
+      toast({
+        title: 'There was an issue editing the list',
+        description: error.message ?? 'Please try again later',
+        variant: 'destructive',
+      })
+    }
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={onClose}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Edit List</DialogTitle>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+            <FormField
+              control={form.control}
+              name="title"
+              render={({ field }) => (
+                <FormItem>
+                  {/* <FormLabel>Question</FormLabel> */}
+                  <FormControl>
+                    <Input placeholder="Title" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Resolution criteria</FormLabel>
+                  <FormControl>
+                    <div className="min-h-[80px]">
+                      <Editor
+                        inputClassName="border text-sm p-3 min-h-[80px]"
+                        placeholder="Description..."
+                        {...field}
+                        value={field.value ?? ''}
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="tags"
+              render={({ field: { value, onChange, ...field } }) => (
+                <FormItem>
+                  <FormLabel>Tags</FormLabel>
+                  <FormControl>
+                    <MultiSelect
+                      value={value?.map((v) => ({ value: v, label: v }))}
+                      onChange={(values) => onChange(values?.map((v) => v.value))}
+                      hideClearAllButton
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <Button disabled={!isDirty || !isValid} loading={isSubmitting} type="submit">
+              Publish list edits
+            </Button>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/packages/lists/components/ListPage.tsx b/packages/lists/components/ListPage.tsx
index 6214afa5..e96959b7 100644
--- a/packages/lists/components/ListPage.tsx
+++ b/packages/lists/components/ListPage.tsx
@@ -17,9 +17,10 @@ import { UserLink } from '@play-money/users/components/UserLink'
 import { useUser } from '@play-money/users/context/UserContext'
 import { useSelectedItems } from '../../ui/src/contexts/SelectedItemContext'
 import { useSearchParam } from '../../ui/src/hooks/useSearchParam'
-import { canAddToList } from '../rules'
+import { canAddToList, canModifyList } from '../rules'
 import { ExtendedList } from '../types'
 import { AddMoreListDialog } from './AddMoreListDialog'
+import { EditListDialog } from './EditListDialog'
 import { ListMarketRow } from './ListMarketRow'
 import { ListToolbar } from './ListToolbar'
 
@@ -36,6 +37,7 @@ export function ListPage({
   const { triggerEffect } = useSidebar()
   const { selected, setSelected } = useSelectedItems()
   const [isAddMore, setIsAddMore] = useSearchParam('addMore')
+  const [isEditing, setIsEditing] = useSearchParam('edit')
 
   const handleRevalidateBalance = async () => {
     void onRevalidate?.()
@@ -45,7 +47,11 @@ export function ListPage({
 
   return (
     <Card className="flex-1">
-      <ListToolbar list={list} />
+      <ListToolbar
+        list={list}
+        canEdit={user ? canModifyList({ list, user }) : false}
+        onInitiateEdit={() => setIsEditing('true')}
+      />
 
       <CardHeader className="pt-0 md:pt-0">
         <CardTitle className="leading-relaxed">{list.title}</CardTitle>
@@ -125,6 +131,14 @@ export function ListPage({
       <div className="px-6 text-lg font-semibold">Comments</div>
       {renderComments}
 
+      <EditListDialog
+        key={list.updatedAt.toString()} // reset form when list updates
+        list={list}
+        open={isEditing === 'true'}
+        onClose={() => setIsEditing(undefined)}
+        onSuccess={onRevalidate}
+      />
+
       <AddMoreListDialog
         list={list}
         open={isAddMore != null}
diff --git a/packages/lists/components/ListToolbar.tsx b/packages/lists/components/ListToolbar.tsx
index d896588a..13b4b82d 100644
--- a/packages/lists/components/ListToolbar.tsx
+++ b/packages/lists/components/ListToolbar.tsx
@@ -1,15 +1,29 @@
 'use client'
 
-import { MoreVertical, Link } from 'lucide-react'
+import { MoreVertical, Link, Pencil } from 'lucide-react'
 import React from 'react'
 import { Button } from '@play-money/ui/button'
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@play-money/ui/dropdown-menu'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@play-money/ui/dropdown-menu'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@play-money/ui/tooltip'
 import { toast } from '@play-money/ui/use-toast'
 import { useUser } from '@play-money/users/context/UserContext'
 import { ExtendedList } from '../types'
 
-export function ListToolbar({ list }: { list: ExtendedList }) {
+export function ListToolbar({
+  list,
+  canEdit,
+  onInitiateEdit,
+}: {
+  list: ExtendedList
+  canEdit?: boolean
+  onInitiateEdit: () => void
+}) {
   const { user } = useUser()
 
   const handleCopyLink = async () => {
@@ -32,6 +46,12 @@ export function ListToolbar({ list }: { list: ExtendedList }) {
 
   return (
     <div className="flex items-center justify-end">
+      {canEdit ? (
+        <Button variant="ghost" size="sm" onClick={onInitiateEdit}>
+          <Pencil className="h-4 w-4" />
+          <span>Edit</span>
+        </Button>
+      ) : null}
       <Tooltip>
         <TooltipTrigger asChild>
           <Button variant="ghost" size="icon" onClick={handleCopyLink}>
@@ -52,6 +72,16 @@ export function ListToolbar({ list }: { list: ExtendedList }) {
         <DropdownMenuContent align="end">
           <DropdownMenuItem onClick={handleCopyLink}>Copy link</DropdownMenuItem>
           {user ? <DropdownMenuItem onClick={handleCopyReferralLink}>Copy referral link</DropdownMenuItem> : null}
+
+          {canEdit ? (
+            <>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem onClick={onInitiateEdit}>
+                <Pencil className="mr-2 h-4 w-4" />
+                Edit list
+              </DropdownMenuItem>
+            </>
+          ) : null}
         </DropdownMenuContent>
       </DropdownMenu>
     </div>
diff --git a/packages/lists/lib/createList.ts b/packages/lists/lib/createList.ts
index f672548c..52ffd55a 100644
--- a/packages/lists/lib/createList.ts
+++ b/packages/lists/lib/createList.ts
@@ -1,12 +1,27 @@
 import Decimal from 'decimal.js'
+import _ from 'lodash'
 import db, { Market } from '@play-money/database'
 import { QuestionContributionPolicyType } from '@play-money/database/zod/inputTypeSchemas/QuestionContributionPolicySchema'
 import { getBalance } from '@play-money/finance/lib/getBalances'
 import { createMarket } from '@play-money/markets/lib/createMarket'
+import { getMarketTagsLLM } from '@play-money/markets/lib/getMarketTagsLLM'
 import { slugifyTitle } from '@play-money/markets/lib/helpers'
 import { getUserPrimaryAccount } from '@play-money/users/lib/getUserPrimaryAccount'
 import { calculateTotalCost } from './helpers'
 
+const COLORS = [
+  '#f44336',
+  '#9c27b0',
+  '#3f51b5',
+  '#2196f3',
+  '#009688',
+  '#8bc34a',
+  '#ffc107',
+  '#ff9800',
+  '#795548',
+  '#607d8b',
+]
+
 export async function createList({
   title,
   description,
@@ -27,6 +42,7 @@ export async function createList({
   const slug = slugifyTitle(title)
   const totalCost = calculateTotalCost(markets.length)
   const costPerMarket = new Decimal(totalCost).div(markets.length)
+  const SHUFFLED_COLORS = _.shuffle(COLORS)
 
   const userAccount = await getUserPrimaryAccount({ userId: ownerId })
   const userPrimaryBalance = await getBalance({
@@ -39,15 +55,36 @@ export async function createList({
     throw new Error('User does not have enough balance to create list')
   }
 
+  const generatedTags = tags ?? (await getMarketTagsLLM({ question: title }))
+
+  const list = await db.list.create({
+    data: {
+      title,
+      description,
+      ownerId,
+      slug,
+      tags: generatedTags.map((tag) => slugifyTitle(tag)),
+      contributionPolicy,
+    },
+    include: {
+      markets: {
+        include: {
+          market: true,
+        },
+      },
+    },
+  })
+
   const createdMarkets: Array<Market> = []
   for (const market of markets) {
     const createdMarket = await createMarket({
+      parentListId: list.id,
       question: market.name,
       description: description ?? '',
       options: [
         {
           name: 'Yes',
-          color: market.color ?? '#3B82F6',
+          color: market.color ?? SHUFFLED_COLORS[createdMarkets.length % SHUFFLED_COLORS.length],
         },
         {
           name: 'No',
@@ -61,53 +98,16 @@ export async function createList({
     createdMarkets.push(createdMarket)
   }
 
-  const createdList = await db.$transaction(
-    async (tx) => {
-      const list = await tx.list.create({
-        data: {
-          title,
-          description,
-          ownerId,
-          slug,
-          tags: tags?.map((tag) => slugifyTitle(tag)),
-          markets: {
-            createMany: {
-              data: createdMarkets.map((market) => ({
-                marketId: market.id,
-              })),
-            },
-          },
-          contributionPolicy,
-        },
+  return db.list.findFirstOrThrow({
+    where: {
+      id: list.id,
+    },
+    include: {
+      markets: {
         include: {
-          markets: {
-            include: {
-              market: true,
-            },
-          },
+          market: true,
         },
-      })
-
-      await Promise.all(
-        createdMarkets.map((market) => {
-          return tx.market.update({
-            where: {
-              id: market.id,
-            },
-            data: {
-              parentListId: list.id,
-            },
-          })
-        })
-      )
-
-      return list
+      },
     },
-    {
-      maxWait: 5000,
-      timeout: 10000,
-    }
-  )
-
-  return createdList
+  })
 }
diff --git a/packages/markets/components/MarketOverviewPage.tsx b/packages/markets/components/MarketOverviewPage.tsx
index a7caf0c0..0593d4a8 100644
--- a/packages/markets/components/MarketOverviewPage.tsx
+++ b/packages/markets/components/MarketOverviewPage.tsx
@@ -2,7 +2,7 @@
 
 import { format, isPast } from 'date-fns'
 import _ from 'lodash'
-import { CircleCheckBig, ChevronDown, Link2Icon } from 'lucide-react'
+import { CircleCheckBig, ChevronDown, Link2Icon, ArrowRight } from 'lucide-react'
 import Link from 'next/link'
 import React from 'react'
 import { mutate } from 'swr'
@@ -28,7 +28,7 @@ import { UserLink } from '@play-money/users/components/UserLink'
 import { useUser } from '@play-money/users/context/UserContext'
 import { useSelectedItems } from '../../ui/src/contexts/SelectedItemContext'
 import { useSearchParam } from '../../ui/src/hooks/useSearchParam'
-import { canModifyMarket } from '../rules'
+import { canModifyMarket, isMarketClosed } from '../rules'
 import { ExtendedMarket } from '../types'
 import { EditMarketDialog } from './EditMarketDialog'
 import { EditMarketOptionDialog } from './EditMarketOptionDialog'
@@ -65,6 +65,7 @@ export function MarketOverviewPage({
   const [isEditing, setIsEditing] = useSearchParam('edit')
   const [isEditOption, setIsEditOption] = useSearchParam('editOption')
   const [isBoosting, setIsBoosting] = useSearchParam('boost')
+  const [, setResolving] = useSearchParam('resolve')
   const isCreator = user?.id === market.createdBy
   const probabilities = marketOptionBalancesToProbabilities(balance?.amm)
 
@@ -94,194 +95,208 @@ export function MarketOverviewPage({
   }
 
   return (
-    <Card className="flex-1">
-      <MarketToolbar
-        market={market}
-        canEdit={user ? canModifyMarket({ market, user }) : false}
-        onInitiateEdit={() => setIsEditing('true')}
-        onInitiateBoost={() => setIsBoosting('true')}
-        onRevalidate={handleRevalidateBalance}
-      />
+    <>
+      {isMarketClosed({ market }) ? (
+        <div
+          className="flex flex-row items-center justify-between gap-2 rounded border border-primary bg-primary/10 p-1 pl-3 text-foreground"
+          onClick={() => setResolving('true')}
+        >
+          This question has ended, please resolve it now.
+          <Button size="sm">
+            Resolve <ArrowRight className="h-4 w-4" />
+          </Button>
+        </div>
+      ) : null}
 
-      <CardHeader className="pt-0 md:pt-0">
-        {market.parentList ? (
-          <Link
-            href={`/lists/${market.parentList.id}/${market.parentList.slug}`}
-            className="flex items-center gap-2 text-muted-foreground"
-          >
-            <Link2Icon className="size-5" />
-            {market.parentList.title}
-          </Link>
-        ) : null}
-        <CardTitle className="leading-relaxed">{market.question}</CardTitle>
-        <div className="flex flex-row flex-wrap gap-x-4 gap-y-2 text-sm text-muted-foreground md:flex-nowrap">
-          {market.canceledAt ? (
-            <div className="text-muted-foreground">
-              <span className="font-semibold">Canceled</span>
-            </div>
-          ) : null}
-          {!market.marketResolution && !market.canceledAt ? (
-            <div style={{ color: mostLikelyOption.color }} className="flex-shrink-0 font-medium">
-              {Math.round(mostLikelyOption.probability || 0)}% {_.truncate(mostLikelyOption.name, { length: 30 })}
-            </div>
-          ) : null}
-          {market.liquidityCount ? (
-            <div className="flex-shrink-0">
-              <CurrencyDisplay value={market.liquidityCount} isShort /> Vol.
-            </div>
-          ) : null}
+      <Card className="flex-1">
+        <MarketToolbar
+          market={market}
+          canEdit={user ? canModifyMarket({ market, user }) : false}
+          onInitiateEdit={() => setIsEditing('true')}
+          onInitiateBoost={() => setIsBoosting('true')}
+          onRevalidate={handleRevalidateBalance}
+        />
 
-          {market.closeDate ? (
-            <div className="flex-shrink-0">
-              {isPast(market.closeDate) ? 'Ended' : 'Ending'} {format(market.closeDate, 'MMM d, yyyy')}
-            </div>
+        <CardHeader className="pt-0 md:pt-0">
+          {market.parentList ? (
+            <Link
+              href={`/lists/${market.parentList.id}/${market.parentList.slug}`}
+              className="flex items-center gap-2 text-muted-foreground"
+            >
+              <Link2Icon className="size-5" />
+              {market.parentList.title}
+            </Link>
           ) : null}
-          {market.user ? (
-            <div className="flex items-center gap-1 truncate">
-              <UserAvatar user={market.user} size="sm" />
-              <UserLink user={market.user} hideUsername />
-            </div>
-          ) : null}
-          {/* <div>15 Traders</div>
+          <CardTitle className="leading-relaxed">{market.question}</CardTitle>
+          <div className="flex flex-row flex-wrap gap-x-4 gap-y-2 text-sm text-muted-foreground md:flex-nowrap">
+            {market.canceledAt ? (
+              <div className="text-muted-foreground">
+                <span className="font-semibold">Canceled</span>
+              </div>
+            ) : null}
+            {!market.marketResolution && !market.canceledAt ? (
+              <div style={{ color: mostLikelyOption.color }} className="flex-shrink-0 font-medium">
+                {Math.round(mostLikelyOption.probability || 0)}% {_.truncate(mostLikelyOption.name, { length: 30 })}
+              </div>
+            ) : null}
+            {market.liquidityCount ? (
+              <div className="flex-shrink-0">
+                <CurrencyDisplay value={market.liquidityCount} isShort /> Vol.
+              </div>
+            ) : null}
+
+            {market.closeDate ? (
+              <div className="flex-shrink-0">
+                {isPast(market.closeDate) ? 'Ended' : 'Ending'} {format(market.closeDate, 'MMM d, yyyy')}
+              </div>
+            ) : null}
+            {market.user ? (
+              <div className="flex items-center gap-1 truncate">
+                <UserAvatar user={market.user} size="sm" />
+                <UserLink user={market.user} hideUsername />
+              </div>
+            ) : null}
+            {/* <div>15 Traders</div>
           <div>$650 Volume</div> */}
-        </div>
-      </CardHeader>
-      <CardContent>
-        <MarketGraph market={market} activeOptionId={selected[0]} />
-      </CardContent>
+          </div>
+        </CardHeader>
+        <CardContent>
+          <MarketGraph market={market} activeOptionId={selected[0]} />
+        </CardContent>
 
-      <CardContent>
-        {market.marketResolution ? (
-          <>
-            <Alert>
-              <CircleCheckBig style={{ color: market.marketResolution.resolution.color }} className="h-4 w-4" />
-              <AlertTitle className="flex justify-between">
-                <span className="text-lg leading-none">{market.marketResolution.resolution.name}</span>
-                <Badge
-                  style={{
-                    backgroundColor: market.marketResolution.resolution.color,
-                    color: getTextContrast(market.marketResolution.resolution.color),
-                  }}
-                >
-                  Resolved
-                </Badge>
-              </AlertTitle>
-              <AlertDescription className="text-muted-foreground">
-                By <UserLink user={market.marketResolution.resolvedBy} /> on{' '}
-                {format(market.marketResolution.updatedAt, 'MMM d, yyyy')}
-              </AlertDescription>
-              {market.marketResolution.supportingLink ? (
-                <AlertDescription>
-                  <a
-                    href={market.marketResolution.supportingLink}
-                    target="_blank"
-                    rel="noreferrer"
-                    className="text-primary hover:underline"
+        <CardContent>
+          {market.marketResolution ? (
+            <>
+              <Alert>
+                <CircleCheckBig style={{ color: market.marketResolution.resolution.color }} className="h-4 w-4" />
+                <AlertTitle className="flex justify-between">
+                  <span className="text-lg leading-none">{market.marketResolution.resolution.name}</span>
+                  <Badge
+                    style={{
+                      backgroundColor: market.marketResolution.resolution.color,
+                      color: getTextContrast(market.marketResolution.resolution.color),
+                    }}
                   >
-                    {market.marketResolution.supportingLink}
-                  </a>
+                    Resolved
+                  </Badge>
+                </AlertTitle>
+                <AlertDescription className="text-muted-foreground">
+                  By <UserLink user={market.marketResolution.resolvedBy} /> on{' '}
+                  {format(market.marketResolution.updatedAt, 'MMM d, yyyy')}
                 </AlertDescription>
+                {market.marketResolution.supportingLink ? (
+                  <AlertDescription>
+                    <a
+                      href={market.marketResolution.supportingLink}
+                      target="_blank"
+                      rel="noreferrer"
+                      className="text-primary hover:underline"
+                    >
+                      {market.marketResolution.supportingLink}
+                    </a>
+                  </AlertDescription>
+                ) : null}
+              </Alert>
+              {orderedMarketOptions.length ? (
+                <Collapsible>
+                  <CollapsibleTrigger asChild>
+                    <Button variant="ghost" className="text-muted-foreground" size="sm">
+                      View more <ChevronDown className="ml-1 h-4 w-4" />
+                    </Button>
+                  </CollapsibleTrigger>
+                  <CollapsibleContent>
+                    <Card>
+                      {orderedMarketOptions.map((option, i) => (
+                        <MarketOptionRow
+                          key={option.id}
+                          option={option}
+                          active={option.id === selected[0]}
+                          probability={probabilities[option.id] || option.probability || 0}
+                          className={i > 0 ? 'border-t' : ''}
+                          canEdit={user ? canModifyMarket({ market, user }) : false}
+                          onEdit={() => setIsEditOption(option.id)}
+                          onSelect={() => {
+                            setSelected([option.id])
+                            triggerEffect()
+                          }}
+                        />
+                      ))}
+                    </Card>
+                  </CollapsibleContent>
+                </Collapsible>
               ) : null}
-            </Alert>
-            {orderedMarketOptions.length ? (
-              <Collapsible>
-                <CollapsibleTrigger asChild>
-                  <Button variant="ghost" className="text-muted-foreground" size="sm">
-                    View more <ChevronDown className="ml-1 h-4 w-4" />
-                  </Button>
-                </CollapsibleTrigger>
-                <CollapsibleContent>
-                  <Card>
-                    {orderedMarketOptions.map((option, i) => (
-                      <MarketOptionRow
-                        key={option.id}
-                        option={option}
-                        active={option.id === selected[0]}
-                        probability={probabilities[option.id] || option.probability || 0}
-                        className={i > 0 ? 'border-t' : ''}
-                        canEdit={user ? canModifyMarket({ market, user }) : false}
-                        onEdit={() => setIsEditOption(option.id)}
-                        onSelect={() => {
-                          setSelected([option.id])
-                          triggerEffect()
-                        }}
-                      />
-                    ))}
-                  </Card>
-                </CollapsibleContent>
-              </Collapsible>
-            ) : null}
-          </>
-        ) : orderedMarketOptions.length ? (
-          <Card>
-            {orderedMarketOptions.map((option, i) => (
-              <MarketOptionRow
-                key={option.id}
-                option={option}
-                active={option.id === selected[0]}
-                probability={probabilities[option.id] || option.probability || 0}
-                className={i > 0 ? 'border-t' : ''}
-                canEdit={user ? canModifyMarket({ market, user }) : false}
-                onEdit={() => setIsEditOption(option.id)}
-                onSelect={() => {
-                  setSelected([option.id])
-                  triggerEffect()
-                }}
-              />
-            ))}
-          </Card>
-        ) : null}
-      </CardContent>
-
-      <CardContent className="space-y-2">
-        {market.description ? <ReadMoreEditor value={market.description} maxLines={6} /> : null}
+            </>
+          ) : orderedMarketOptions.length ? (
+            <Card>
+              {orderedMarketOptions.map((option, i) => (
+                <MarketOptionRow
+                  key={option.id}
+                  option={option}
+                  active={option.id === selected[0]}
+                  probability={probabilities[option.id] || option.probability || 0}
+                  className={i > 0 ? 'border-t' : ''}
+                  canEdit={user ? canModifyMarket({ market, user }) : false}
+                  onEdit={() => setIsEditOption(option.id)}
+                  onSelect={() => {
+                    setSelected([option.id])
+                    triggerEffect()
+                  }}
+                />
+              ))}
+            </Card>
+          ) : null}
+        </CardContent>
 
-        {market.tags.length ? (
-          <div className="flex flex-wrap gap-2">
-            {market.tags.map((tag) => (
-              <Link href={`/questions/tagged/${tag}`} key={tag}>
-                <Badge variant="secondary">{tag}</Badge>
-              </Link>
-            ))}
-          </div>
-        ) : null}
-      </CardContent>
+        <CardContent className="space-y-2">
+          {market.description ? <ReadMoreEditor value={market.description} maxLines={6} /> : null}
 
-      {!market.resolvedAt && !market.canceledAt ? (
-        <CardContent>
-          <LiquidityBoostAlert onClick={() => setIsBoosting('true')} />
+          {market.tags.length ? (
+            <div className="flex flex-wrap gap-2">
+              {market.tags.map((tag) => (
+                <Link href={`/questions/tagged/${tag}`} key={tag}>
+                  <Badge variant="secondary">{tag}</Badge>
+                </Link>
+              ))}
+            </div>
+          ) : null}
         </CardContent>
-      ) : null}
 
-      <div className="flex flex-row items-center justify-between px-6 ">
-        <div className="text-lg font-semibold">Activity</div>
-      </div>
+        {!market.resolvedAt && !market.canceledAt ? (
+          <CardContent>
+            <LiquidityBoostAlert onClick={() => setIsBoosting('true')} />
+          </CardContent>
+        ) : null}
 
-      <div className="mt-2 px-6">
-        <CreateCommentForm onSubmit={handleCreateComment} startCollapsed />
-      </div>
-      {renderActivitiy}
+        <div className="flex flex-row items-center justify-between px-6 ">
+          <div className="text-lg font-semibold">Activity</div>
+        </div>
+
+        <div className="mt-2 px-6">
+          <CreateCommentForm onSubmit={handleCreateComment} startCollapsed />
+        </div>
+        {renderActivitiy}
 
-      <EditMarketDialog
-        key={market.updatedAt.toString()} // reset form when market updates
-        market={market}
-        open={isEditing === 'true'}
-        onClose={() => setIsEditing(undefined)}
-        onSuccess={onRevalidate}
-      />
-      <EditMarketOptionDialog
-        market={market}
-        optionId={isEditOption!}
-        open={isEditOption != null}
-        onClose={() => setIsEditOption(undefined)}
-        onSuccess={onRevalidate}
-      />
-      <LiquidityBoostDialog
-        market={market}
-        open={isBoosting === 'true'}
-        onClose={() => setIsBoosting(undefined)}
-        onSuccess={handleRevalidateBalance}
-      />
-    </Card>
+        <EditMarketDialog
+          key={market.updatedAt.toString()} // reset form when market updates
+          market={market}
+          open={isEditing === 'true'}
+          onClose={() => setIsEditing(undefined)}
+          onSuccess={onRevalidate}
+        />
+        <EditMarketOptionDialog
+          market={market}
+          optionId={isEditOption!}
+          open={isEditOption != null}
+          onClose={() => setIsEditOption(undefined)}
+          onSuccess={onRevalidate}
+        />
+        <LiquidityBoostDialog
+          market={market}
+          open={isBoosting === 'true'}
+          onClose={() => setIsBoosting(undefined)}
+          onSuccess={handleRevalidateBalance}
+        />
+      </Card>
+    </>
   )
 }
diff --git a/packages/markets/lib/createMarket.ts b/packages/markets/lib/createMarket.ts
index 95c03162..577f7733 100644
--- a/packages/markets/lib/createMarket.ts
+++ b/packages/markets/lib/createMarket.ts
@@ -7,6 +7,7 @@ import { createDailyMarketBonusTransaction } from '@play-money/quests/lib/create
 import { hasCreatedMarketToday } from '@play-money/quests/lib/helpers'
 import { getUserPrimaryAccount } from '@play-money/users/lib/getUserPrimaryAccount'
 import { createMarketLiquidityTransaction } from './createMarketLiquidityTransaction'
+import { getMarketTagsLLM } from './getMarketTagsLLM'
 import { slugifyTitle } from './helpers'
 
 type PartialOptions = Pick<MarketOption, 'name' | 'color'>
@@ -60,6 +61,8 @@ export async function createMarket({
     throw new Error('User does not have enough balance to create market')
   }
 
+  const generatedTags = tags ?? (await getMarketTagsLLM({ question }))
+
   const now = new Date()
   const createdMarket = await db.market.create({
     data: {
@@ -67,7 +70,7 @@ export async function createMarket({
       description,
       closeDate,
       slug,
-      tags: tags?.map((tag) => slugifyTitle(tag)),
+      tags: generatedTags.map((tag) => slugifyTitle(tag)),
       options: {
         createMany: {
           data: parsedOptions.map((option, i) => ({
@@ -86,6 +89,11 @@ export async function createMarket({
                 id: parentListId,
               },
             } as unknown as undefined,
+            lists: {
+              create: {
+                listId: parentListId,
+              },
+            },
           }
         : {}),
 
diff --git a/packages/markets/lib/getMarketQuote.ts b/packages/markets/lib/getMarketQuote.ts
index 4fcccd19..aa891aa4 100644
--- a/packages/markets/lib/getMarketQuote.ts
+++ b/packages/markets/lib/getMarketQuote.ts
@@ -22,15 +22,19 @@ export async function getMarketQuote({
   const optionBalances = ammBalances.filter(({ assetType }) => assetType === 'MARKET_OPTION')
   const optionsShares = optionBalances.map(({ total }) => total)
 
+  if (!targetBalance) {
+    throw new Error('Target balance not found')
+  }
+
   // TODO: Change to multi-step quote to account for limit orders
   let { newProbabilities, shares } = await quote({
     amount,
     probability: isBuy ? new Decimal(0.99) : new Decimal(0.01),
-    targetShare: targetBalance!.total,
+    targetShare: targetBalance.total,
     shares: optionsShares,
   })
 
-  const shareIndex = findShareIndex(optionsShares, targetBalance!.total)
+  const shareIndex = findShareIndex(optionsShares, targetBalance.total)
   const distributed = distributeRemainder(newProbabilities)
   const tax = calculateRealizedGainsTax({ cost: amount, salePrice: shares })
 
diff --git a/packages/markets/rules.ts b/packages/markets/rules.ts
index cc10adac..0f87deff 100644
--- a/packages/markets/rules.ts
+++ b/packages/markets/rules.ts
@@ -19,6 +19,10 @@ export function isMarketTradable({ market }: { market: Market }): boolean {
   return !market.closeDate || new Date(market.closeDate) > now
 }
 
+export function isMarketClosed({ market }: { market: Market }): boolean {
+  return !isMarketTradable({ market }) && !isMarketResolved({ market }) && !isMarketCanceled({ market })
+}
+
 export function isMarketResolved({ market }: { market: Market }): boolean {
   return Boolean(market.resolvedAt)
 }
diff --git a/packages/ui/src/components/ui/alert.tsx b/packages/ui/src/components/ui/alert.tsx
index 9ec40670..d2669f39 100644
--- a/packages/ui/src/components/ui/alert.tsx
+++ b/packages/ui/src/components/ui/alert.tsx
@@ -8,6 +8,7 @@ const alertVariants = cva(
     variants: {
       variant: {
         default: 'bg-background text-foreground',
+        primary: 'bg-primary/10 border-primary text-foreground',
         muted: 'bg-muted text-muted-foreground [&>svg]:text-muted-foreground',
         destructive: 'border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive',
       },