diff --git a/app/opportunities/[opportunity_id]/edit/_components/general/generalEditForm.tsx b/app/opportunities/[opportunity_id]/edit/_components/general/generalEditForm.tsx
index 7bd037b3..18ea0839 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/general/generalEditForm.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/general/generalEditForm.tsx
@@ -5,7 +5,6 @@ import { GeneralInformationSchema } from "@lib/schemas/opportunity";
 import { Save } from "lucide-react";
 import { toast } from "sonner";
 import { Button } from "@components/ui/button";
-import { useRouter } from "next/navigation";
 import { type Session } from "next-auth";
 import Breadcrumbs from "@components/ui/breadcrumbs";
 import { Form } from "@components/ui/form";
@@ -16,13 +15,12 @@ import { GeneralInformation } from "../../../_components/general/general";
 import { DeleteButton } from "../deleteButton";
 
 interface Props {
-  session: Session;
   defaultValues: z.infer<typeof GeneralInformationSchema>;
   update: (
     input: z.infer<typeof GeneralInformationSchema>,
   ) => Promise<Opportunity>;
 }
-const EditGeneralForm = ({ session, defaultValues, update }: Props) => {
+const EditGeneralForm = ({ defaultValues, update }: Props) => {
   const form = useForm<z.infer<typeof GeneralInformationSchema>>({
     resolver: zodResolver(GeneralInformationSchema),
     defaultValues,
diff --git a/app/opportunities/[opportunity_id]/edit/_components/general/index.tsx b/app/opportunities/[opportunity_id]/edit/_components/general/index.tsx
index c288ab47..60abcf47 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/general/index.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/general/index.tsx
@@ -61,11 +61,5 @@ export async function EditGeneral({
     });
   }
 
-  return (
-    <EditGeneralForm
-      session={session}
-      defaultValues={defaultValues}
-      update={update}
-    />
-  );
+  return <EditGeneralForm defaultValues={defaultValues} update={update} />;
 }
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/editPhasesForm.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/editPhasesForm.tsx
index a770a4cb..86160fd1 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/editPhasesForm.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/editPhasesForm.tsx
@@ -2,10 +2,10 @@
 
 import Phase from "./phases/phase";
 import { type z } from "zod";
-import { AddPhasePopover } from "./phases/addPhasePopover";
+import { PhasePopover } from "./phases/phasePopover";
 import { type PhasesSchema } from "@lib/schemas/opportunity";
 import { Button } from "@components/ui/button";
-import { Save } from "lucide-react";
+import { Plus, Save } from "lucide-react";
 import { toast } from "sonner";
 import { TallyForm } from "./tally/tallyForm";
 import { createPhasesStore, PhasesContext } from "./usePhasesStore";
@@ -72,7 +72,7 @@ export function EditPhasesForm({ defaultValues, update }: Props) {
                   />
                 ))}
 
-                <AddPhasePopover
+                <PhasePopover
                   onSave={(data) => appendPhase(data)}
                   className="flex w-max opacity-0 transition-opacity group-hover/phases:opacity-100"
                 />
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/index.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/index.tsx
index 7fc99621..e4a13388 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/index.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/index.tsx
@@ -32,6 +32,7 @@ export async function EditPhases({ opportunityId }: { opportunityId: string }) {
   const defaultPhases = opportunity.phases.map((phase) => ({
     id: phase.id,
     name: phase.name,
+    isInterview: phase.isInterview,
     questionnaires: phase.questionnaires.map((questionnaire) => ({
       id: questionnaire.id,
       name: questionnaire.name,
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/phases/addPhasePopover.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/phases/addPhasePopover.tsx
deleted file mode 100644
index 4929485d..00000000
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/phases/addPhasePopover.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Button } from "@components/ui/button";
-import { Input } from "@components/ui/input";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@components/ui/popover";
-import {
-  type SubmitHandler,
-  type UseFieldArrayAppend,
-  useForm,
-} from "react-hook-form";
-import { type PhasesSchema, PhaseSchema } from "@lib/schemas/opportunity";
-import { type z } from "zod";
-import { useState } from "react";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@components/ui/form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Plus } from "lucide-react";
-import { type Phase as PhaseType } from "@lib/types/opportunity";
-import { v4 as uuidv4 } from "uuid";
-import { cn } from "@lib/utils";
-
-interface Props {
-  onSave: (phase: PhaseType) => void;
-  className?: string;
-}
-
-export const AddPhasePopover = ({ onSave, className }: Props) => {
-  const [popoverOpen, setPopoverOpen] = useState(false);
-
-  const defaultValues = {
-    id: uuidv4(),
-    name: ``,
-    questionnaires: [],
-  };
-
-  const form = useForm<z.infer<typeof PhaseSchema>>({
-    resolver: zodResolver(PhaseSchema),
-    defaultValues,
-  });
-
-  const onSubmit: SubmitHandler<z.infer<typeof PhaseSchema>> = (data) => {
-    onSave(data);
-    form.reset(defaultValues);
-    setPopoverOpen(false);
-  };
-
-  return (
-    <Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
-      <PopoverTrigger asChild>
-        <Button variant="outline" size="sm" className={cn(className)}>
-          <Plus className="mr-2" /> Add Phase
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className="w-80 space-y-4">
-        <Form {...form}>
-          <h4 className="scroll-m-20 text-xl font-semibold tracking-tight">
-            Add Phase
-          </h4>
-
-          <FormField
-            control={form.control}
-            name="name"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Name*</FormLabel>
-                <FormControl>
-                  <Input placeholder="Screening" {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          <Button
-            variant="secondary"
-            className="w-full"
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            onClick={form.handleSubmit(onSubmit, (err) => console.error(err))}
-          >
-            Add
-          </Button>
-        </Form>
-      </PopoverContent>
-    </Popover>
-  );
-};
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phase.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phase.tsx
index 7fa5db04..800c6c41 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phase.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phase.tsx
@@ -1,6 +1,13 @@
 import { Button } from "@components/ui/button";
 import { Separator } from "@components/ui/separator";
-import { Ellipsis, FolderPen, Move, Plus, Trash } from "lucide-react";
+import {
+  Ellipsis,
+  FolderPen,
+  Handshake,
+  Move,
+  Plus,
+  Trash,
+} from "lucide-react";
 import { QuestionnaireDialog } from "../questionnaire/questionnaireDialog";
 import { Card } from "@components/ui/card";
 import {
@@ -17,6 +24,7 @@ import {
 } from "@components/ui/tooltip";
 import { usePhasesContext } from "../usePhasesStore";
 import { cn } from "@lib/utils";
+import { PhasePopover } from "./phasePopover";
 
 interface Props {
   index: number;
@@ -28,6 +36,7 @@ export default function Phase({ index: phaseIndex, className }: Props) {
   if (!phase) throw new Error(`Phase does not exist at index ${phaseIndex}`);
 
   const onRemove = usePhasesContext((s) => s.removePhase);
+  const onSave = usePhasesContext((s) => s.updatePhase)(phaseIndex);
   const appendQuestionnaire = usePhasesContext((s) => s.appendQuestionnaire)(
     phaseIndex,
   );
@@ -41,10 +50,11 @@ export default function Phase({ index: phaseIndex, className }: Props) {
   return (
     <Card className={cn("group w-80", className)}>
       <div className="flex flex-row items-center justify-between p-2">
-        <h4 className="scroll-m-20 text-xl font-semibold tracking-tight">
+        <h4 className="flex scroll-m-20 items-center text-xl font-semibold tracking-tight">
+          {phase.isInterview && <Handshake className="mr-2 h-6 w-6" />}
           {phase.name}
         </h4>
-        <div className="flex flex-row gap-1">
+        <div className="flex flex-row gap-2">
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <Button
@@ -57,10 +67,6 @@ export default function Phase({ index: phaseIndex, className }: Props) {
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent>
-              <DropdownMenuItem>
-                <FolderPen className="mr-2 h-4 w-4" />
-                <span>Rename</span>
-              </DropdownMenuItem>
               <DropdownMenuItem>
                 <Move className="mr-2 h-4 w-4" />
                 <span>Move</span>
@@ -72,6 +78,17 @@ export default function Phase({ index: phaseIndex, className }: Props) {
             </DropdownMenuContent>
           </DropdownMenu>
 
+          <PhasePopover onSave={onSave} defaultValues={phase}>
+            <Button
+              type="button"
+              size="icon-sm"
+              variant="ghost"
+              className="text-muted-foreground"
+            >
+              <FolderPen />
+            </Button>
+          </PhasePopover>
+
           <QuestionnaireDialog onSave={appendQuestionnaire}>
             <Button
               type="button"
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phasePopover.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phasePopover.tsx
new file mode 100644
index 00000000..ca5c11b9
--- /dev/null
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/phases/phasePopover.tsx
@@ -0,0 +1,140 @@
+import { Button } from "@components/ui/button";
+import { Input } from "@components/ui/input";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@components/ui/popover";
+import {
+  type SubmitHandler,
+  useForm,
+  type UseFormProps,
+} from "react-hook-form";
+import { PhaseSchema } from "@lib/schemas/opportunity";
+import { type z } from "zod";
+import { useState } from "react";
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@components/ui/form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus, Save } from "lucide-react";
+import { type Phase as PhaseType } from "@lib/types/opportunity";
+import { v4 as uuidv4 } from "uuid";
+import { cn } from "@lib/utils";
+import { Checkbox } from "@components/ui/checkbox";
+
+interface Props {
+  onSave: (phase: PhaseType) => void;
+  children?: React.ReactNode;
+  defaultValues?: UseFormProps<z.infer<typeof PhaseSchema>>["defaultValues"];
+  className?: string;
+}
+
+export const PhasePopover = ({
+  onSave,
+  children,
+  defaultValues: initialDefaultValues,
+  className,
+}: Props) => {
+  const [popoverOpen, setPopoverOpen] = useState(false);
+
+  const defaultValues = {
+    id: uuidv4(),
+    name: "",
+    questionnaires: [],
+    isInterview: false,
+  };
+
+  const form = useForm<z.infer<typeof PhaseSchema>>({
+    resolver: zodResolver(PhaseSchema),
+    defaultValues: initialDefaultValues ?? defaultValues,
+  });
+
+  const onSubmit: SubmitHandler<z.infer<typeof PhaseSchema>> = (data) => {
+    onSave(data);
+
+    if (!initialDefaultValues) {
+      form.reset(defaultValues);
+    }
+
+    setPopoverOpen(false);
+  };
+
+  return (
+    <Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
+      <PopoverTrigger asChild>
+        {!!children ? (
+          children
+        ) : (
+          <Button variant="outline" size="sm" className={cn(className)}>
+            <Plus className="mr-2" />
+            {initialDefaultValues ? "Edit" : "Add"} Phase
+          </Button>
+        )}
+      </PopoverTrigger>
+      <PopoverContent>
+        <Form {...form}>
+          <form
+            onSubmit={form.handleSubmit(onSave, console.error)}
+            className="space-y-4"
+          >
+            <h4 className="scroll-m-20 text-xl font-semibold tracking-tight">
+              {initialDefaultValues ? "Edit" : "Add"} Phase
+            </h4>
+
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Name*</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Screening" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="isInterview"
+              render={({ field }) => (
+                <FormItem className="flex flex-row items-start space-x-3 space-y-0">
+                  <FormControl>
+                    <Checkbox
+                      checked={field.value}
+                      onCheckedChange={field.onChange}
+                    />
+                  </FormControl>
+                  <div className="space-y-1 leading-none">
+                    <FormLabel>Is Interview</FormLabel>
+                    <FormDescription>
+                      Applications for interviews can be manually picked
+                    </FormDescription>
+                  </div>
+                </FormItem>
+              )}
+            />
+
+            <Button
+              variant="secondary"
+              className="w-full"
+              // eslint-disable-next-line @typescript-eslint/no-misused-promises
+              onClick={form.handleSubmit(onSubmit, (err) => console.error(err))}
+            >
+              <Save className="mr-2" />
+              Save
+            </Button>
+          </form>
+        </Form>
+      </PopoverContent>
+    </Popover>
+  );
+};
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/questionnaire/questionnaireDialog.tsx b/app/opportunities/[opportunity_id]/edit/_components/phases/questionnaire/questionnaireDialog.tsx
index 8b3257a6..19eda981 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/questionnaire/questionnaireDialog.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/questionnaire/questionnaireDialog.tsx
@@ -35,6 +35,7 @@ import { Card } from "@components/ui/card";
 import { QuestionForm, type QuestionFormProps } from "./question";
 import type { Question } from "@lib/types/question";
 import { UsersStack } from "../../usersStack";
+import { useSession } from "next-auth/react";
 
 const QuestionEdit = ({
   question,
diff --git a/app/opportunities/[opportunity_id]/edit/_components/phases/usePhasesStore.ts b/app/opportunities/[opportunity_id]/edit/_components/phases/usePhasesStore.ts
index 17de4d55..561dfc57 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/phases/usePhasesStore.ts
+++ b/app/opportunities/[opportunity_id]/edit/_components/phases/usePhasesStore.ts
@@ -1,6 +1,6 @@
 import { type Phase, type Questionnaire } from "@lib/types/opportunity";
 import { createStore, useStore } from "zustand";
-import { createContext, useContext, useRef } from "react";
+import { createContext, useContext } from "react";
 import { immer } from "zustand/middleware/immer";
 
 interface Props {
@@ -9,6 +9,7 @@ interface Props {
 
 interface PhasesState extends Props {
   appendPhase: (data: Phase) => void;
+  updatePhase: (index: number) => (data: Phase) => void;
   removePhase: (index: number) => void;
 
   appendQuestionnaire: (
@@ -37,6 +38,10 @@ export const createPhasesStore = (initProps?: Partial<Props>) => {
         set((state) => {
           state.phases.push(data);
         }),
+      updatePhase: (index) => (data) =>
+        set((state) => {
+          state.phases[index] = data;
+        }),
       removePhase: (index) =>
         set((state) => {
           state.phases.splice(index, 1);
diff --git a/app/opportunities/[opportunity_id]/edit/_components/usersStack.tsx b/app/opportunities/[opportunity_id]/edit/_components/usersStack.tsx
index fcbc73e9..ac7a8fa7 100644
--- a/app/opportunities/[opportunity_id]/edit/_components/usersStack.tsx
+++ b/app/opportunities/[opportunity_id]/edit/_components/usersStack.tsx
@@ -9,6 +9,7 @@ import {
 } from "@components/ui/tooltip";
 import { AddUserPopup } from "@components/user/addUserPopup";
 import { type Person } from "@lib/types/person";
+import { cn } from "@lib/utils";
 import { Minus, Plus, UserMinus } from "lucide-react";
 
 interface Props {
@@ -46,7 +47,7 @@ export const UsersStack = ({ users, append, remove, key }: Props) => {
         </Tooltip>
       ))}
       <AddUserPopup append={append} users={users}>
-        <span className="pl-4">
+        <span className={cn(users.length && "pl-4")}>
           <Button
             size="icon-sm"
             type="button"
diff --git a/lib/faker/opportunities.ts b/lib/faker/opportunities.ts
index cfb4c792..5aff941b 100644
--- a/lib/faker/opportunities.ts
+++ b/lib/faker/opportunities.ts
@@ -92,6 +92,7 @@ export function generatePhases(): Phase[] {
 function generatePhase(): Phase {
   return {
     name: faker.word.words(2),
+    isInterview: false,
     questionnaires: Array.from(
       {
         length: faker.number.int({
diff --git a/lib/schemas/opportunity.ts b/lib/schemas/opportunity.ts
index b1f13108..156e8df9 100644
--- a/lib/schemas/opportunity.ts
+++ b/lib/schemas/opportunity.ts
@@ -13,6 +13,7 @@ export const QuestionnaireSchema = z.object({
 
 export const PhaseSchema = z.object({
   id: z.string().uuid().optional(),
+  isInterview: z.boolean().default(false),
   name: z.string().min(1, "Phase name is required"),
   questionnaires: z.array(QuestionnaireSchema),
 });