diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx
index f0fc31af..f7277618 100644
--- a/web/components/answers/answers-panel.tsx
+++ b/web/components/answers/answers-panel.tsx
@@ -82,13 +82,14 @@ export function AnswersPanel(props: {
 
   return (
     <Col className="gap-3">
-      {(resolveOption || resolution === 'MKT') &&
+      {(resolveOption === 'CHOOSE' ||
+        resolveOption === 'CHOOSE_MULTIPLE' ||
+        resolution === 'MKT') &&
         sortedAnswers.map((answer) => (
           <AnswerItem
             key={answer.id}
             answer={answer}
             contract={contract}
-            user={user}
             showChoice={showChoice}
             chosenProb={chosenAnswers[answer.id]}
             totalChosenProb={chosenTotal}
@@ -101,9 +102,10 @@ export function AnswersPanel(props: {
         <div className="pb-4 text-gray-500">No answers yet...</div>
       )}
 
-      {tradingAllowed(contract) && !resolveOption && (
-        <CreateAnswerPanel contract={contract} />
-      )}
+      {tradingAllowed(contract) &&
+        (!resolveOption || resolveOption === 'CANCEL') && (
+          <CreateAnswerPanel contract={contract} />
+        )}
 
       {user?.id === creatorId && !resolution && (
         <>
diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx
index 822ca55e..d2e7ae41 100644
--- a/web/components/yes-no-selector.tsx
+++ b/web/components/yes-no-selector.tsx
@@ -195,7 +195,7 @@ function Button(props: {
         color === 'red' && 'bg-red-400 text-white hover:bg-red-500',
         color === 'yellow' && 'bg-yellow-400 text-white hover:bg-yellow-500',
         color === 'blue' && 'bg-blue-400 text-white hover:bg-blue-500',
-        color === 'gray' && 'bg-gray-300 text-gray-700 hover:bg-gray-400',
+        color === 'gray' && 'bg-gray-200 text-gray-700 hover:bg-gray-300',
         className
       )}
       onClick={onClick}