diff --git a/src/components/OutputsTable/OutputCell/OutputCell.tsx b/src/components/OutputsTable/OutputCell/OutputCell.tsx
index 1338ab9..595dd20 100644
--- a/src/components/OutputsTable/OutputCell/OutputCell.tsx
+++ b/src/components/OutputsTable/OutputCell/OutputCell.tsx
@@ -42,8 +42,7 @@ export default function OutputCell({
     { refetchInterval },
   );
 
-  const { mutateAsync: hardRefetchMutate } =
-    api.scenarioVariantCells.forceRefetch.useMutation();
+  const { mutateAsync: hardRefetchMutate } = api.scenarioVariantCells.forceRefetch.useMutation();
   const [hardRefetch, hardRefetching] = useHandledAsyncCallback(async () => {
     await hardRefetchMutate({ scenarioId: scenario.id, variantId: variant.id });
     await utils.scenarioVariantCells.get.invalidate({
diff --git a/src/components/RefinePromptModal/CompareFunctions.tsx b/src/components/RefinePromptModal/CompareFunctions.tsx
index 8b8561f..fee9736 100644
--- a/src/components/RefinePromptModal/CompareFunctions.tsx
+++ b/src/components/RefinePromptModal/CompareFunctions.tsx
@@ -35,7 +35,7 @@ const CompareFunctions = ({
 
   return (
     <HStack w="full" spacing={5}>
-      <VStack w="full" spacing={4} maxH="50vh" fontSize={12} lineHeight={1} overflowY="auto">
+      <VStack w="full" spacing={4} maxH="40vh" fontSize={12} lineHeight={1} overflowY="auto">
         <DiffViewer
           oldValue={originalFunction}
           newValue={newFunction || originalFunction}
diff --git a/src/components/RefinePromptModal/CustomInstructionsInput.tsx b/src/components/RefinePromptModal/CustomInstructionsInput.tsx
new file mode 100644
index 0000000..98b499d
--- /dev/null
+++ b/src/components/RefinePromptModal/CustomInstructionsInput.tsx
@@ -0,0 +1,75 @@
+import { Button, Spinner, InputGroup, InputRightElement, Icon, HStack } from "@chakra-ui/react";
+import { IoMdSend } from "react-icons/io";
+import AutoResizeTextArea from "../AutoResizeTextArea";
+
+export const CustomInstructionsInput = ({
+  instructions,
+  setInstructions,
+  loading,
+  onSubmit,
+}: {
+  instructions: string;
+  setInstructions: (instructions: string) => void;
+  loading: boolean;
+  onSubmit: () => void;
+}) => {
+  return (
+    <InputGroup
+      size="md"
+      w="full"
+      maxW="600"
+      boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);"
+      borderRadius={8}
+      alignItems="center"
+      colorScheme="orange"
+    >
+      <AutoResizeTextArea
+        value={instructions}
+        onChange={(e) => setInstructions(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" && !e.metaKey && !e.ctrlKey && !e.shiftKey) {
+            e.preventDefault();
+            e.currentTarget.blur();
+            onSubmit();
+          }
+        }}
+        placeholder="Send custom instructions"
+        py={4}
+        pl={4}
+        pr={12}
+        colorScheme="orange"
+        borderColor="gray.300"
+        borderWidth={1}
+        _hover={{
+          borderColor: "gray.300",
+        }}
+        _focus={{
+          borderColor: "gray.300",
+        }}
+        isDisabled={loading}
+      />
+      <HStack></HStack>
+      <InputRightElement width="8" height="full">
+        <Button
+          h="8"
+          w="8"
+          minW="unset"
+          size="sm"
+          onClick={() => onSubmit()}
+          disabled={!instructions}
+          variant={instructions ? "solid" : "ghost"}
+          mr={4}
+          borderRadius="8"
+          bgColor={instructions ? "orange.400" : "transparent"}
+          colorScheme="orange"
+        >
+          {loading ? (
+            <Spinner boxSize={4} />
+          ) : (
+            <Icon as={IoMdSend} color={instructions ? "white" : "gray.500"} boxSize={5} />
+          )}
+        </Button>
+      </InputRightElement>
+    </InputGroup>
+  );
+};
diff --git a/src/components/RefinePromptModal/RefineOption.tsx b/src/components/RefinePromptModal/RefineOption.tsx
new file mode 100644
index 0000000..9a0eb77
--- /dev/null
+++ b/src/components/RefinePromptModal/RefineOption.tsx
@@ -0,0 +1,64 @@
+import { HStack, Icon, Heading, Text, VStack, GridItem } from "@chakra-ui/react";
+import { type IconType } from "react-icons";
+import { refineOptions, type RefineOptionLabel } from "./refineOptions";
+
+export const RefineOption = ({
+  label,
+  activeLabel,
+  icon,
+  onClick,
+  loading,
+}: {
+  label: RefineOptionLabel;
+  activeLabel: RefineOptionLabel | undefined;
+  icon: IconType;
+  onClick: (label: RefineOptionLabel) => void;
+  loading: boolean;
+}) => {
+  const isActive = activeLabel === label;
+  const desciption = refineOptions[label].description;
+
+  return (
+    <GridItem w="80" h="44">
+      <VStack
+        w="full"
+        h="full"
+        onClick={() => {
+          !loading && onClick(label);
+        }}
+        borderColor={isActive ? "blue.500" : "gray.200"}
+        borderWidth={2}
+        borderRadius={16}
+        padding={6}
+        backgroundColor="gray.50"
+        _hover={
+          loading
+            ? undefined
+            : {
+                backgroundColor: "gray.100",
+              }
+        }
+        spacing={8}
+        boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);"
+        cursor="pointer"
+        opacity={loading ? 0.5 : 1}
+      >
+        <HStack cursor="pointer" spacing={6} fontSize="sm" fontWeight="medium" color="gray.500">
+          <Icon as={icon} boxSize={12} />
+          <Heading size="md" fontFamily="inconsolata, monospace">
+            {label}
+          </Heading>
+        </HStack>
+        <Text
+          fontSize="sm"
+          color="gray.500"
+          flexWrap="wrap"
+          wordBreak="break-word"
+          overflowWrap="break-word"
+        >
+          {desciption}
+        </Text>
+      </VStack>
+    </GridItem>
+  );
+};
diff --git a/src/components/RefinePromptModal/RefinePromptModal.tsx b/src/components/RefinePromptModal/RefinePromptModal.tsx
index 8bf206f..7cd13b5 100644
--- a/src/components/RefinePromptModal/RefinePromptModal.tsx
+++ b/src/components/RefinePromptModal/RefinePromptModal.tsx
@@ -11,17 +11,20 @@ import {
   Text,
   Spinner,
   HStack,
-  InputGroup,
-  InputRightElement,
   Icon,
+  SimpleGrid,
 } from "@chakra-ui/react";
-import { IoMdSend } from "react-icons/io";
+import { BsStars } from "react-icons/bs";
+import { VscJson } from "react-icons/vsc";
+import { TfiThought } from "react-icons/tfi";
 import { api } from "~/utils/api";
 import { useHandledAsyncCallback } from "~/utils/hooks";
 import { type PromptVariant } from "@prisma/client";
 import { useState } from "react";
 import CompareFunctions from "./CompareFunctions";
-import AutoResizeTextArea from "../AutoResizeTextArea";
+import { CustomInstructionsInput } from "./CustomInstructionsInput";
+import { type RefineOptionLabel, refineOptions } from "./refineOptions";
+import { RefineOption } from "./RefineOption";
 
 export const RefinePromptModal = ({
   variant,
@@ -36,13 +39,22 @@ export const RefinePromptModal = ({
     api.promptVariants.getRefinedPromptFn.useMutation();
   const [instructions, setInstructions] = useState<string>("");
 
-  const [getRefinedPromptFn, refiningInProgress] = useHandledAsyncCallback(async () => {
-    if (!variant.experimentId) return;
-    await getRefinedPromptMutateAsync({
-      id: variant.id,
-      instructions,
-    });
-  }, [getRefinedPromptMutateAsync, onClose, variant, instructions]);
+  const [activeRefineOptionLabel, setActiveRefineOptionLabel] = useState<
+    RefineOptionLabel | undefined
+  >(undefined);
+
+  const [getRefinedPromptFn, refiningInProgress] = useHandledAsyncCallback(
+    async (label?: RefineOptionLabel) => {
+      if (!variant.experimentId) return;
+      const updatedInstructions = label ? refineOptions[label].instructions : instructions;
+      setActiveRefineOptionLabel(label);
+      await getRefinedPromptMutateAsync({
+        id: variant.id,
+        instructions: updatedInstructions,
+      });
+    },
+    [getRefinedPromptMutateAsync, onClose, variant, instructions, setActiveRefineOptionLabel],
+  );
 
   const replaceVariantMutation = api.promptVariants.replaceVariant.useMutation();
 
@@ -60,65 +72,42 @@ export const RefinePromptModal = ({
     <Modal isOpen onClose={onClose} size={{ base: "xl", sm: "2xl", md: "7xl" }}>
       <ModalOverlay />
       <ModalContent w={1200}>
-        <ModalHeader>Refine with GPT-4</ModalHeader>
+        <ModalHeader>
+          <HStack>
+            <Icon as={BsStars} />
+            <Text>Refine with GPT-4</Text>
+          </HStack>
+        </ModalHeader>
         <ModalCloseButton />
         <ModalBody maxW="unset">
-          <VStack spacing={16} pt={8}>
-            <InputGroup
-              size="md"
-              w="full"
-              maxW="600"
-              boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);"
-              borderRadius={8}
-              alignItems="center"
-              colorScheme="orange"
-            >
-              <AutoResizeTextArea
-                value={instructions}
-                onChange={(e) => setInstructions(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" && !e.metaKey && !e.ctrlKey && !e.shiftKey) {
-                    e.preventDefault();
-                    e.currentTarget.blur();
-                    getRefinedPromptFn();
-                  }
-                }}
-                placeholder="Send instructions"
-                py={4}
-                pl={4}
-                pr={12}
-                colorScheme="orange"
-                borderColor="gray.300"
-                borderWidth={1}
-                _hover={{
-                  borderColor: "gray.300",
-                }}
-                _focus={{
-                  borderColor: "gray.300",
-                }}
-              />
-              <InputRightElement width="8" height="full">
-                <Button
-                  h="8"
-                  w="8"
-                  minW="unset"
-                  size="sm"
+          <VStack spacing={8}>
+            <VStack spacing={4}>
+              <SimpleGrid columns={{ base: 1, md: 2 }} spacing={8}>
+                <RefineOption
+                  label="Convert to function call"
+                  activeLabel={activeRefineOptionLabel}
+                  icon={VscJson}
                   onClick={getRefinedPromptFn}
-                  disabled={!instructions}
-                  variant={instructions ? "solid" : "ghost"}
-                  mr={4}
-                  borderRadius="8"
-                  bgColor={instructions ? "orange.400" : "transparent"}
-                  colorScheme="orange"
-                >
-                  {refiningInProgress ? (
-                    <Spinner boxSize={4} />
-                  ) : (
-                    <Icon as={IoMdSend} color={instructions ? "white" : "gray.500"} boxSize={5} />
-                  )}
-                </Button>
-              </InputRightElement>
-            </InputGroup>
+                  loading={refiningInProgress}
+                />
+                <RefineOption
+                  label="Add chain of thought"
+                  activeLabel={activeRefineOptionLabel}
+                  icon={TfiThought}
+                  onClick={getRefinedPromptFn}
+                  loading={refiningInProgress}
+                />
+              </SimpleGrid>
+              <HStack>
+                <Text color="gray.500">or</Text>
+              </HStack>
+              <CustomInstructionsInput
+                instructions={instructions}
+                setInstructions={setInstructions}
+                loading={refiningInProgress}
+                onSubmit={getRefinedPromptFn}
+              />
+            </VStack>
             <CompareFunctions
               originalFunction={variant.constructFn}
               newFunction={refinedPromptFn}
@@ -127,11 +116,11 @@ export const RefinePromptModal = ({
         </ModalBody>
 
         <ModalFooter>
-          <HStack spacing={4} pt={8}>
+          <HStack spacing={4}>
             <Button
               onClick={replaceVariant}
               minW={24}
-              disabled={true}
+              disabled={replacementInProgress || !refinedPromptFn}
               _disabled={{
                 bgColor: "blue.500",
               }}
diff --git a/src/components/RefinePromptModal/refineOptions.ts b/src/components/RefinePromptModal/refineOptions.ts
new file mode 100644
index 0000000..768815b
--- /dev/null
+++ b/src/components/RefinePromptModal/refineOptions.ts
@@ -0,0 +1,70 @@
+// Super hacky, but we'll redo the organization when we have more models
+
+export type RefineOptionLabel = "Add chain of thought" | "Convert to function call";
+
+export const refineOptions: Record<
+  RefineOptionLabel,
+  { description: string; instructions: string }
+> = {
+  "Add chain of thought": {
+    description: "Asks the model to think about its answer before it gives it to you.",
+    instructions: `Adding chain of thought means asking the model to think about its answer before it gives it to you. This is useful for getting more accurate answers. Do not add an assistant message.
+      
+      Add chain of thought to the original prompt.`,
+  },
+  "Convert to function call": {
+    description: "Converts the prompt to a function call.",
+    instructions: `Function calls are a specific way for an LLM to return output. This is what a prompt looks like without using function calls:
+    
+    prompt = {
+      model: "gpt-4",
+      stream: true,
+      messages: [
+        {
+          role: "system",
+          content: \`Evaluate sentiment.\`,
+        },
+        {
+          role: "user",
+          content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
+        },
+      ],
+    };
+  
+    This is what one looks like using function calls:
+  
+    prompt = {
+      model: "gpt-3.5-turbo-0613",
+      stream: true,
+      messages: [
+        {
+          role: "system",
+          content: "Evaluate sentiment.",
+        },
+        {
+          role: "user",
+          content: scenario.user_message,
+        },
+      ],
+      functions: [
+        {
+          name: "extract_sentiment",
+          parameters: {
+            type: "object", // parameters must always be an object with a properties key
+            properties: { // properties key is required
+              sentiment: {
+                type: "string",
+                description: "one of positive/negative/neutral",
+              },
+            },
+          },
+        },
+      ],
+      function_call: {
+        name: "extract_sentiment",
+      },
+    };  
+    
+    Add a function call that takes one or more nested parameters.`,
+  },
+};
diff --git a/src/components/SelectModelModal/SelectModelModal.tsx b/src/components/SelectModelModal/SelectModelModal.tsx
index e1e77e4..69cef85 100644
--- a/src/components/SelectModelModal/SelectModelModal.tsx
+++ b/src/components/SelectModelModal/SelectModelModal.tsx
@@ -10,7 +10,10 @@ import {
   VStack,
   Text,
   Spinner,
+  HStack,
+  Icon,
 } from "@chakra-ui/react";
+import { RiExchangeFundsFill } from "react-icons/ri";
 import { useState } from "react";
 import { type SupportedModel } from "~/server/types";
 import { ModelStatsCard } from "./ModelStatsCard";
@@ -49,7 +52,12 @@ export const SelectModelModal = ({
     <Modal isOpen onClose={onClose} size={{ base: "xl", sm: "2xl", md: "3xl" }}>
       <ModalOverlay />
       <ModalContent w={1200}>
-        <ModalHeader>Select a New Model</ModalHeader>
+        <ModalHeader>
+          <HStack>
+            <Icon as={RiExchangeFundsFill} />
+            <Text>Change Model</Text>
+          </HStack>
+        </ModalHeader>
         <ModalCloseButton />
         <ModalBody maxW="unset">
           <VStack spacing={8}>
diff --git a/src/components/VariantHeader/VariantHeaderMenuButton.tsx b/src/components/VariantHeader/VariantHeaderMenuButton.tsx
index 725d52b..a3b5f85 100644
--- a/src/components/VariantHeader/VariantHeaderMenuButton.tsx
+++ b/src/components/VariantHeader/VariantHeaderMenuButton.tsx
@@ -12,9 +12,8 @@ import {
   Text,
   Spinner,
 } from "@chakra-ui/react";
-import { BsFillTrashFill, BsGear } from "react-icons/bs";
+import { BsFillTrashFill, BsGear, BsStars } from "react-icons/bs";
 import { FaRegClone } from "react-icons/fa";
-import { AiOutlineDiff } from "react-icons/ai";
 import { useState } from "react";
 import { RefinePromptModal } from "../RefinePromptModal/RefinePromptModal";
 import { RiExchangeFundsFill } from "react-icons/ri";
@@ -79,7 +78,7 @@ export default function VariantHeaderMenuButton({
             Change Model
           </MenuItem>
           <MenuItem
-            icon={<Icon as={AiOutlineDiff} boxSize={5} />}
+            icon={<Icon as={BsStars} boxSize={5} />}
             onClick={() => setRefinePromptModalOpen(true)}
           >
             Refine
diff --git a/src/server/utils/deriveNewContructFn.ts b/src/server/utils/deriveNewContructFn.ts
index 34c023d..b9a5b6d 100644
--- a/src/server/utils/deriveNewContructFn.ts
+++ b/src/server/utils/deriveNewContructFn.ts
@@ -40,59 +40,6 @@ const requestUpdatedPromptFunction = async (
 ) => {
   const originalModel = originalVariant.model as SupportedModel;
   let newContructionFn = "";
-  const usefulTips = `Adding chain of thought means asking the model to think about its answer before it gives it to you. This is useful for getting more accurate answers. Do not add an assistant message.
-  
-  Function calls are a specific way for an LLM to return output. This is what a prompt looks like without using function calls:
-  
-  prompt = {
-    model: "gpt-4",
-    stream: true,
-    messages: [
-      {
-        role: "system",
-        content: \`Evaluate sentiment.\`,
-      },
-      {
-        role: "user",
-        content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
-      },
-    ],
-  };
-
-  This is what one looks like using function calls:
-
-  prompt = {
-    model: "gpt-3.5-turbo-0613",
-    stream: true,
-    messages: [
-      {
-        role: "system",
-        content: "Evaluate sentiment.",
-      },
-      {
-        role: "user",
-        content: scenario.user_message,
-      },
-    ],
-    functions: [
-      {
-        name: "extract_sentiment",
-        parameters: {
-          type: "object", // parameters must always be an object with a properties key
-          properties: { // properties key is required
-            sentiment: {
-              type: "string",
-              description: "one of positive/negative/neutral",
-            },
-          },
-        },
-      },
-    ],
-    function_call: {
-      name: "extract_sentiment",
-    },
-  };  
-  `;
   for (let i = 0; i < NUM_RETRIES; i++) {
     try {
       const messages: CompletionCreateParams.CreateChatCompletionRequestNonStreaming.Message[] = [
@@ -112,13 +59,9 @@ const requestUpdatedPromptFunction = async (
         });
       }
       if (instructions) {
-        messages.push({
-          role: "system",
-          content: `Here is some useful information about prompt engineering: ${usefulTips}`,
-        });
         messages.push({
           role: "user",
-          content: `Follow these instructions: ${instructions}`,
+          content: instructions,
         });
       }
       messages.push({