diff --git a/www/app/[domain]/browse/page.tsx b/www/app/[domain]/browse/page.tsx
index 877d19b5..4a59c6dc 100644
--- a/www/app/[domain]/browse/page.tsx
+++ b/www/app/[domain]/browse/page.tsx
@@ -100,6 +100,7 @@ export default function TranscriptBrowser() {
       api
         .v1TranscriptDelete(transcriptToDeleteId)
         .then(() => {
+          refetch();
           setDeletionLoading(false);
           refetch();
           onCloseDeletion();
diff --git a/www/app/[domain]/transcripts/[transcriptId]/finalSummary.tsx b/www/app/[domain]/transcripts/[transcriptId]/finalSummary.tsx
new file mode 100644
index 00000000..afde0aac
--- /dev/null
+++ b/www/app/[domain]/transcripts/[transcriptId]/finalSummary.tsx
@@ -0,0 +1,150 @@
+import { useEffect, useRef, useState } from "react";
+import React from "react";
+import Markdown from "react-markdown";
+import "../../../styles/markdown.css";
+import {
+  GetTranscript,
+  GetTranscriptTopic,
+  UpdateTranscript,
+} from "../../../api";
+import useApi from "../../../lib/useApi";
+import {
+  Flex,
+  Heading,
+  IconButton,
+  Button,
+  Textarea,
+  Spacer,
+} from "@chakra-ui/react";
+import { FaPen } from "react-icons/fa";
+import { useError } from "../../../(errors)/errorContext";
+import ShareAndPrivacy from "../shareAndPrivacy";
+
+type FinalSummaryProps = {
+  transcriptResponse: GetTranscript;
+  topicsResponse: GetTranscriptTopic[];
+};
+
+export default function FinalSummary(props: FinalSummaryProps) {
+  const finalSummaryRef = useRef<HTMLParagraphElement>(null);
+
+  const [isEditMode, setIsEditMode] = useState(false);
+  const [preEditSummary, setPreEditSummary] = useState("");
+  const [editedSummary, setEditedSummary] = useState("");
+
+  const api = useApi();
+
+  const { setError } = useError();
+
+  useEffect(() => {
+    setEditedSummary(props.transcriptResponse?.long_summary || "");
+  }, [props.transcriptResponse?.long_summary]);
+
+  if (!props.topicsResponse || !props.transcriptResponse) {
+    return null;
+  }
+
+  const updateSummary = async (newSummary: string, transcriptId: string) => {
+    try {
+      const requestBody: UpdateTranscript = {
+        long_summary: newSummary,
+      };
+      const updatedTranscript = await api?.v1TranscriptUpdate(
+        transcriptId,
+        requestBody,
+      );
+      console.log("Updated long summary:", updatedTranscript);
+    } catch (err) {
+      console.error("Failed to update long summary:", err);
+      setError(err, "Failed to update long summary.");
+    }
+  };
+
+  const onEditClick = () => {
+    setPreEditSummary(editedSummary);
+    setIsEditMode(true);
+  };
+
+  const onDiscardClick = () => {
+    setEditedSummary(preEditSummary);
+    setIsEditMode(false);
+  };
+
+  const onSaveClick = () => {
+    updateSummary(editedSummary, props.transcriptResponse.id);
+    setIsEditMode(false);
+  };
+
+  const handleTextAreaKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === "Escape") {
+      onDiscardClick();
+    }
+
+    if (e.key === "Enter" && e.shiftKey) {
+      onSaveClick();
+      e.preventDefault(); // prevent the default action of adding a new line
+    }
+  };
+
+  return (
+    <Flex
+      direction="column"
+      maxH={"100%"}
+      h={"100%"}
+      overflowY={isEditMode ? "hidden" : "auto"}
+      pb={4}
+    >
+      <Flex dir="row" justify="start" align="center" wrap={"wrap-reverse"}>
+        <Heading size={{ base: "md" }}>Summary</Heading>
+
+        {isEditMode && (
+          <>
+            <Spacer />
+            <Button
+              onClick={onDiscardClick}
+              colorScheme="gray"
+              variant={"text"}
+            >
+              Discard
+            </Button>
+            <Button onClick={onSaveClick} colorScheme="blue">
+              Save
+            </Button>
+          </>
+        )}
+
+        {!isEditMode && (
+          <>
+            <IconButton
+              icon={<FaPen />}
+              aria-label="Edit Summary"
+              onClick={onEditClick}
+            />
+            <Spacer />
+            <ShareAndPrivacy
+              finalSummaryRef={finalSummaryRef}
+              transcriptResponse={props.transcriptResponse}
+              topicsResponse={props.topicsResponse}
+            />
+          </>
+        )}
+      </Flex>
+
+      {isEditMode ? (
+        <Textarea
+          value={editedSummary}
+          onChange={(e) => setEditedSummary(e.target.value)}
+          className="markdown"
+          onKeyDown={(e) => handleTextAreaKeyDown(e)}
+          h={"100%"}
+          resize={"none"}
+          mt={2}
+        />
+      ) : (
+        <div ref={finalSummaryRef} className="markdown">
+          <Markdown>{editedSummary}</Markdown>
+        </div>
+      )}
+    </Flex>
+  );
+}
diff --git a/www/app/[domain]/transcripts/[transcriptId]/page.tsx b/www/app/[domain]/transcripts/[transcriptId]/page.tsx
index d0389fd9..5faa31e1 100644
--- a/www/app/[domain]/transcripts/[transcriptId]/page.tsx
+++ b/www/app/[domain]/transcripts/[transcriptId]/page.tsx
@@ -8,16 +8,11 @@ import { TopicList } from "../topicList";
 import { Topic } from "../webSocketTypes";
 import React, { useEffect, useState } from "react";
 import "../../../styles/button.css";
-import FinalSummary from "../finalSummary";
-import ShareLink from "../shareLink";
-import QRCode from "react-qr-code";
+import FinalSummary from "./finalSummary";
 import TranscriptTitle from "../transcriptTitle";
-import ShareModal from "./shareModal";
 import Player from "../player";
-import WaveformLoading from "../waveformLoading";
 import { useRouter } from "next/navigation";
-import { featureEnabled } from "../../domainContext";
-import { toShareMode } from "../../../lib/shareMode";
+import { Flex, Grid, GridItem, Skeleton, Text } from "@chakra-ui/react";
 
 type TranscriptDetails = {
   params: {
@@ -34,7 +29,6 @@ export default function TranscriptDetails(details: TranscriptDetails) {
   const waveform = useWaveform(transcriptId);
   const useActiveTopic = useState<Topic | null>(null);
   const mp3 = useMp3(transcriptId);
-  const [showModal, setShowModal] = useState(false);
 
   useEffect(() => {
     const statusToRedirect = ["idle", "recording", "processing"];
@@ -43,18 +37,11 @@ export default function TranscriptDetails(details: TranscriptDetails) {
       // Shallow redirection does not work on NextJS 13
       // https://github.com/vercel/next.js/discussions/48110
       // https://github.com/vercel/next.js/discussions/49540
-      router.push(newUrl, undefined);
+      router.replace(newUrl);
       // history.replaceState({}, "", newUrl);
     }
   }, [transcript.response?.status]);
 
-  const fullTranscript =
-    topics.topics
-      ?.map((topic) => topic.transcript)
-      .join("\n\n")
-      .replace(/ +/g, " ")
-      .trim() || "";
-
   if (transcript.error || topics?.error) {
     return (
       <Modal
@@ -69,25 +56,17 @@ export default function TranscriptDetails(details: TranscriptDetails) {
   }
 
   return (
-    <div className="grid grid-rows-layout-topbar h-full max-h-full gap-2 lg:gap-4">
-      {featureEnabled("sendToZulip") && (
-        <ShareModal
-          transcript={transcript.response}
-          topics={topics ? topics.topics : null}
-          show={showModal}
-          setShow={(v) => setShowModal(v)}
-        />
-      )}
-      <div className="flex flex-col">
-        {transcript?.response?.title && (
-          <TranscriptTitle
-            title={transcript.response.title}
-            transcriptId={transcript.response.id}
-          />
-        )}
-        {waveform.waveform && mp3.media ? (
+    <>
+      <Grid
+        templateColumns="1fr"
+        templateRows="auto minmax(0, 1fr)"
+        gap={4}
+        mt={4}
+        mb={4}
+      >
+        {waveform.waveform && mp3.media && topics.topics ? (
           <Player
-            topics={topics?.topics || []}
+            topics={topics?.topics}
             useActiveTopic={useActiveTopic}
             waveform={waveform.waveform}
             media={mp3.media}
@@ -96,58 +75,64 @@ export default function TranscriptDetails(details: TranscriptDetails) {
         ) : waveform.error ? (
           <div>"error loading this recording"</div>
         ) : (
-          <WaveformLoading />
+          <Skeleton h={14} />
         )}
-      </div>
-      <div className="grid grid-cols-1 lg:grid-cols-2 grid-rows-2 lg:grid-rows-1 gap-2 lg:gap-4 h-full">
-        <TopicList
-          topics={topics.topics || []}
-          useActiveTopic={useActiveTopic}
-          autoscroll={false}
-          transcriptId={transcriptId}
-        />
-
-        <div className="w-full h-full grid grid-rows-layout-one grid-cols-1 gap-2 lg:gap-4">
-          <section className=" bg-blue-400/20 rounded-lg md:rounded-xl p-2 md:px-4 h-full">
-            {transcript.response.long_summary ? (
+        <Grid
+          templateColumns={{ base: "minmax(0, 1fr)", md: "repeat(2, 1fr)" }}
+          templateRows={{
+            base: "auto minmax(0, 1fr) minmax(0, 1fr)",
+            md: "auto minmax(0, 1fr)",
+          }}
+          gap={2}
+          padding={4}
+          paddingBottom={0}
+          background="gray.bg"
+          border={"2px solid"}
+          borderColor={"gray.bg"}
+          borderRadius={8}
+        >
+          <GridItem
+            display="flex"
+            flexDir="row"
+            alignItems={"center"}
+            colSpan={{ base: 1, md: 2 }}
+          >
+            <TranscriptTitle
+              title={transcript.response.title || "Unamed Transcript"}
+              transcriptId={transcriptId}
+            />
+          </GridItem>
+          <TopicList
+            topics={topics.topics || []}
+            useActiveTopic={useActiveTopic}
+            autoscroll={false}
+            transcriptId={transcriptId}
+            status={transcript.response?.status}
+            currentTranscriptText=""
+          />
+          {transcript.response && topics.topics ? (
+            <>
               <FinalSummary
-                fullTranscript={fullTranscript}
-                summary={transcript.response.long_summary}
-                transcriptId={transcript.response.id}
-                openZulipModal={() => setShowModal(true)}
+                transcriptResponse={transcript.response}
+                topicsResponse={topics.topics}
               />
-            ) : (
+            </>
+          ) : (
+            <Flex justify={"center"} alignItems={"center"} h={"100%"}>
               <div className="flex flex-col h-full justify-center content-center">
                 {transcript.response.status == "processing" ? (
-                  <p>Loading Transcript</p>
+                  <Text>Loading Transcript</Text>
                 ) : (
-                  <p>
+                  <Text>
                     There was an error generating the final summary, please come
                     back later
-                  </p>
+                  </Text>
                 )}
               </div>
-            )}
-          </section>
-
-          <section className="flex items-center">
-            <div className="mr-4 hidden md:block h-auto">
-              <QRCode
-                value={`${location.origin}/transcripts/${details.params.transcriptId}`}
-                level="L"
-                size={98}
-              />
-            </div>
-            <div className="flex-grow max-w-full">
-              <ShareLink
-                transcriptId={transcript.response.id}
-                userId={transcript.response.user_id}
-                shareMode={toShareMode(transcript.response.share_mode)}
-              />
-            </div>
-          </section>
-        </div>
-      </div>
-    </div>
+            </Flex>
+          )}
+        </Grid>
+      </Grid>
+    </>
   );
 }
diff --git a/www/app/[domain]/transcripts/[transcriptId]/record/page.tsx b/www/app/[domain]/transcripts/[transcriptId]/record/page.tsx
index 073b5bf8..9c02ed44 100644
--- a/www/app/[domain]/transcripts/[transcriptId]/record/page.tsx
+++ b/www/app/[domain]/transcripts/[transcriptId]/record/page.tsx
@@ -1,22 +1,18 @@
 "use client";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import Recorder from "../../recorder";
 import { TopicList } from "../../topicList";
-import useWebRTC from "../../useWebRTC";
 import useTranscript from "../../useTranscript";
 import { useWebSockets } from "../../useWebSockets";
-import useAudioDevice from "../../useAudioDevice";
 import "../../../../styles/button.css";
 import { Topic } from "../../webSocketTypes";
-import LiveTrancription from "../../liveTranscription";
-import DisconnectedIndicator from "../../disconnectedIndicator";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faGear } from "@fortawesome/free-solid-svg-icons";
 import { lockWakeState, releaseWakeState } from "../../../../lib/wakeLock";
 import { useRouter } from "next/navigation";
 import Player from "../../player";
 import useMp3 from "../../useMp3";
 import WaveformLoading from "../../waveformLoading";
+import { Box, Text, Grid } from "@chakra-ui/react";
+import LiveTrancription from "../../liveTranscription";
 
 type TranscriptDetails = {
   params: {
@@ -25,59 +21,41 @@ type TranscriptDetails = {
 };
 
 const TranscriptRecord = (details: TranscriptDetails) => {
-  const [stream, setStream] = useState<MediaStream | null>(null);
-  const [disconnected, setDisconnected] = useState<boolean>(false);
+  const transcript = useTranscript(details.params.transcriptId);
+  const [transcriptStarted, setTranscriptStarted] = useState(false);
   const useActiveTopic = useState<Topic | null>(null);
 
-  useEffect(() => {
-    if (process.env.NEXT_PUBLIC_ENV === "development") {
-      document.onkeyup = (e) => {
-        if (e.key === "d") {
-          setDisconnected((prev) => !prev);
-        }
-      };
-    }
-  }, []);
-
-  const transcript = useTranscript(details.params.transcriptId);
-  const webRTC = useWebRTC(stream, details.params.transcriptId);
   const webSockets = useWebSockets(details.params.transcriptId);
 
-  const { audioDevices, getAudioStream } = useAudioDevice();
-
-  const [recordedTime, setRecordedTime] = useState(0);
-  const [startTime, setStartTime] = useState(0);
-  const [transcriptStarted, setTranscriptStarted] = useState(false);
   let mp3 = useMp3(details.params.transcriptId, true);
 
   const router = useRouter();
 
+  const [status, setStatus] = useState(
+    webSockets.status.value || transcript.response?.status || "idle"
+  );
+
   useEffect(() => {
-    if (!transcriptStarted && webSockets.transcriptText.length !== 0)
+    if (!transcriptStarted && webSockets.transcriptTextLive.length !== 0)
       setTranscriptStarted(true);
-  }, [webSockets.transcriptText]);
+  }, [webSockets.transcriptTextLive]);
 
   useEffect(() => {
-    const statusToRedirect = ["ended", "error"];
+    //TODO HANDLE ERROR STATUS BETTER
+    const newStatus =
+      webSockets.status.value || transcript.response?.status || "idle";
+    setStatus(newStatus);
+    if (newStatus && (newStatus == "ended" || newStatus == "error")) {
+      console.log(newStatus, "redirecting");
 
-    //TODO if has no topic and is error, get back to new
-    if (
-      transcript.response?.status &&
-      (statusToRedirect.includes(transcript.response?.status) ||
-        statusToRedirect.includes(webSockets.status.value))
-    ) {
       const newUrl = "/transcripts/" + details.params.transcriptId;
-      // Shallow redirection does not work on NextJS 13
-      // https://github.com/vercel/next.js/discussions/48110
-      // https://github.com/vercel/next.js/discussions/49540
       router.replace(newUrl);
-      // history.replaceState({}, "", newUrl);
-    } // history.replaceState({}, "", newUrl);
+    }
   }, [webSockets.status.value, transcript.response?.status]);
 
   useEffect(() => {
-    if (transcript.response?.status === "ended") mp3.getNow();
-  }, [transcript.response]);
+    if (webSockets.waveform && webSockets.waveform) mp3.getNow();
+  }, [webSockets.waveform, webSockets.duration]);
 
   useEffect(() => {
     lockWakeState();
@@ -87,87 +65,60 @@ const TranscriptRecord = (details: TranscriptDetails) => {
   }, []);
 
   return (
-    <div className="grid grid-rows-layout-topbar gap-2 lg:gap-4 max-h-full h-full">
-      {webSockets.waveform && webSockets.duration && mp3?.media ? (
-        <Player
-          topics={webSockets.topics || []}
-          useActiveTopic={useActiveTopic}
-          waveform={webSockets.waveform}
-          media={mp3.media}
-          mediaDuration={webSockets.duration}
-        />
-      ) : recordedTime ? (
+    <Grid
+      templateColumns="1fr"
+      templateRows="auto minmax(0, 1fr) "
+      gap={4}
+      mt={4}
+      mb={4}
+    >
+      {status == "processing" ? (
         <WaveformLoading />
       ) : (
-        <Recorder
-          setStream={setStream}
-          onStop={() => {
-            setStream(null);
-            setRecordedTime(Date.now() - startTime);
-            webRTC?.send(JSON.stringify({ cmd: "STOP" }));
-          }}
-          onRecord={() => {
-            setStartTime(Date.now());
-          }}
-          getAudioStream={getAudioStream}
-          audioDevices={audioDevices}
-          transcriptId={details.params.transcriptId}
-        />
+        // todo: only start recording animation when you get "recorded" status
+        <Recorder transcriptId={details.params.transcriptId} status={status} />
       )}
-
-      <div className="grid grid-cols-1 lg:grid-cols-2 grid-rows-mobile-inner lg:grid-rows-1 gap-2 lg:gap-4 h-full">
+      <Grid
+        templateColumns={{ base: "minmax(0, 1fr)", md: "repeat(2, 1fr)" }}
+        templateRows={{
+          base: "minmax(0, 1fr) minmax(0, 1fr)",
+          md: "minmax(0, 1fr)",
+        }}
+        gap={2}
+        padding={4}
+        paddingBottom={0}
+        background="gray.bg"
+        border={"2px solid"}
+        borderColor={"gray.bg"}
+        borderRadius={8}
+      >
         <TopicList
           topics={webSockets.topics}
           useActiveTopic={useActiveTopic}
           autoscroll={true}
           transcriptId={details.params.transcriptId}
+          status={status}
+          currentTranscriptText={webSockets.accumulatedText}
         />
-
-        <section
-          className={`w-full h-full bg-blue-400/20 rounded-lg md:rounded-xl p-2 md:px-4`}
-        >
-          {!recordedTime ? (
-            <>
-              {transcriptStarted && (
-                <h2 className="md:text-lg font-bold">Transcription</h2>
-              )}
-              <div className="flex flex-col justify-center align center text-center h-full">
-                <div className="py-2 h-auto">
-                  {!transcriptStarted ? (
-                    <div className="text-center text-gray-500">
-                      The conversation transcript will appear here shortly after
-                      you start recording.
-                    </div>
-                  ) : (
-                    <LiveTrancription
-                      text={webSockets.transcriptText}
-                      translateText={webSockets.translateText}
-                    />
-                  )}
-                </div>
-              </div>
-            </>
+        <Box>
+          {!transcriptStarted ? (
+            <Box textAlign={"center"} textColor="gray">
+              <Text>
+                The conversation transcript will appear here shortly after you
+                start recording.
+              </Text>
+            </Box>
           ) : (
-            <div className="flex flex-col justify-center align center text-center h-full text-gray-500">
-              <div className="p-2 md:p-4">
-                <FontAwesomeIcon
-                  icon={faGear}
-                  className="animate-spin-slow h-14 w-14 md:h-20 md:w-20"
-                />
-              </div>
-              <p>
-                We are generating the final summary for you. This may take a
-                couple of minutes. Please do not navigate away from the page
-                during this time.
-              </p>
-              {/* NTH If login required remove last sentence */}
-            </div>
+            status === "recording" && (
+              <LiveTrancription
+                text={webSockets.transcriptTextLive}
+                translateText={webSockets.translateText}
+              />
+            )
           )}
-        </section>
-      </div>
-
-      {disconnected && <DisconnectedIndicator />}
-    </div>
+        </Box>
+      </Grid>
+    </Grid>
   );
 };
 
diff --git a/www/app/[domain]/transcripts/audioInputsDropdown.tsx b/www/app/[domain]/transcripts/audioInputsDropdown.tsx
index 56204286..4a6f9630 100644
--- a/www/app/[domain]/transcripts/audioInputsDropdown.tsx
+++ b/www/app/[domain]/transcripts/audioInputsDropdown.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 import Dropdown, { Option } from "react-dropdown";
 import "react-dropdown/style.css";
 
diff --git a/www/app/[domain]/transcripts/fileUploadButton.tsx b/www/app/[domain]/transcripts/fileUploadButton.tsx
index 7cfaf19e..2e25398d 100644
--- a/www/app/[domain]/transcripts/fileUploadButton.tsx
+++ b/www/app/[domain]/transcripts/fileUploadButton.tsx
@@ -1,9 +1,10 @@
 import React from "react";
 import useApi from "../../lib/useApi";
-import { Body_transcript_record_upload_v1_transcripts__transcript_id__record_upload_post } from "../../api";
+import { Button } from "@chakra-ui/react";
 
 type FileUploadButton = {
   transcriptId: string;
+  disabled?: boolean;
 };
 
 export default function FileUploadButton(props: FileUploadButton) {
@@ -32,12 +33,14 @@ export default function FileUploadButton(props: FileUploadButton) {
 
   return (
     <>
-      <button
-        className="bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500 text-white ml-2 md:ml:4 md:h-[78px] md:min-w-[100px] text-lg"
+      <Button
         onClick={triggerFileUpload}
+        colorScheme="blue"
+        mr={2}
+        isDisabled={props.disabled}
       >
         Upload File
-      </button>
+      </Button>
 
       <input
         type="file"
diff --git a/www/app/[domain]/transcripts/finalSummary.tsx b/www/app/[domain]/transcripts/finalSummary.tsx
deleted file mode 100644
index 6ad90b14..00000000
--- a/www/app/[domain]/transcripts/finalSummary.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import { useRef, useState } from "react";
-import React from "react";
-import Markdown from "react-markdown";
-import "../../styles/markdown.css";
-import { featureEnabled } from "../domainContext";
-import { UpdateTranscript } from "../../api";
-import useApi from "../../lib/useApi";
-
-type FinalSummaryProps = {
-  summary: string;
-  fullTranscript: string;
-  transcriptId: string;
-  openZulipModal: () => void;
-};
-
-export default function FinalSummary(props: FinalSummaryProps) {
-  const finalSummaryRef = useRef<HTMLParagraphElement>(null);
-  const [isCopiedSummary, setIsCopiedSummary] = useState(false);
-  const [isCopiedTranscript, setIsCopiedTranscript] = useState(false);
-  const [isEditMode, setIsEditMode] = useState(false);
-  const [preEditSummary, setPreEditSummary] = useState(props.summary);
-  const [editedSummary, setEditedSummary] = useState(props.summary);
-
-  const updateSummary = async (newSummary: string, transcriptId: string) => {
-    try {
-      const api = useApi();
-      const requestBody: UpdateTranscript = {
-        long_summary: newSummary,
-      };
-      const updatedTranscript = await api?.v1TranscriptUpdate(
-        transcriptId,
-        requestBody,
-      );
-      console.log("Updated long summary:", updatedTranscript);
-    } catch (err) {
-      console.error("Failed to update long summary:", err);
-    }
-  };
-
-  const onCopySummaryClick = () => {
-    let text_to_copy = finalSummaryRef.current?.innerText;
-
-    text_to_copy &&
-      navigator.clipboard.writeText(text_to_copy).then(() => {
-        setIsCopiedSummary(true);
-        // Reset the copied state after 2 seconds
-        setTimeout(() => setIsCopiedSummary(false), 2000);
-      });
-  };
-
-  const onCopyTranscriptClick = () => {
-    let text_to_copy = props.fullTranscript;
-
-    text_to_copy &&
-      navigator.clipboard.writeText(text_to_copy).then(() => {
-        setIsCopiedTranscript(true);
-        // Reset the copied state after 2 seconds
-        setTimeout(() => setIsCopiedTranscript(false), 2000);
-      });
-  };
-
-  const onEditClick = () => {
-    setPreEditSummary(editedSummary);
-    setIsEditMode(true);
-  };
-
-  const onDiscardClick = () => {
-    setEditedSummary(preEditSummary);
-    setIsEditMode(false);
-  };
-
-  const onSaveClick = () => {
-    updateSummary(editedSummary, props.transcriptId);
-    setIsEditMode(false);
-  };
-
-  const handleTextAreaKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "Escape") {
-      onDiscardClick();
-    }
-
-    if (e.key === "Enter" && e.shiftKey) {
-      onSaveClick();
-      e.preventDefault(); // prevent the default action of adding a new line
-    }
-  };
-
-  return (
-    <div
-      className={
-        (isEditMode ? "overflow-y-none" : "overflow-y-auto") +
-        " max-h-full flex flex-col h-full"
-      }
-    >
-      <div className="flex flex-row flex-wrap-reverse justify-between items-center">
-        <h2 className="text-lg sm:text-xl md:text-2xl font-bold">
-          Final Summary
-        </h2>
-
-        <div className="ml-auto flex space-x-2 mb-2">
-          {isEditMode && (
-            <>
-              <button
-                onClick={onDiscardClick}
-                className={"text-gray-500 text-sm hover:underline"}
-              >
-                Discard Changes
-              </button>
-              <button
-                onClick={onSaveClick}
-                className={
-                  "bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2"
-                }
-              >
-                Save Changes
-              </button>
-            </>
-          )}
-
-          {!isEditMode && (
-            <>
-              {featureEnabled("sendToZulip") && (
-                <button
-                  className={
-                    "bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2 sm:text-base"
-                  }
-                  onClick={() => props.openZulipModal()}
-                >
-                  <span className="text-xs">➡️ Zulip</span>
-                </button>
-              )}
-
-              <button
-                onClick={onEditClick}
-                className={
-                  "bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2 sm:text-base"
-                }
-              >
-                <span className="text-xs">✏️ Summary</span>
-              </button>
-              <button
-                onClick={onCopyTranscriptClick}
-                className={
-                  (isCopiedTranscript ? "bg-blue-500" : "bg-blue-400") +
-                  " hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2 sm:text-base"
-                }
-                style={{ minHeight: "30px" }}
-              >
-                <span className="text-xs">
-                  {isCopiedTranscript ? "Copied!" : "Copy Transcript"}
-                </span>
-              </button>
-              <button
-                onClick={onCopySummaryClick}
-                className={
-                  (isCopiedSummary ? "bg-blue-500" : "bg-blue-400") +
-                  " hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2 sm:text-base"
-                }
-                style={{ minHeight: "30px" }}
-              >
-                <span className="text-xs">
-                  {isCopiedSummary ? "Copied!" : "Copy Summary"}
-                </span>
-              </button>
-            </>
-          )}
-        </div>
-      </div>
-
-      {isEditMode ? (
-        <div className="flex-grow overflow-y-none">
-          <textarea
-            value={editedSummary}
-            onChange={(e) => setEditedSummary(e.target.value)}
-            className="markdown w-full h-full d-block p-2 border rounded shadow-sm"
-            onKeyDown={(e) => handleTextAreaKeyDown(e)}
-          />
-        </div>
-      ) : (
-        <p ref={finalSummaryRef} className="markdown">
-          <Markdown>{editedSummary}</Markdown>
-        </p>
-      )}
-    </div>
-  );
-}
diff --git a/www/app/[domain]/transcripts/player.tsx b/www/app/[domain]/transcripts/player.tsx
index c8ffd5ea..59cdb91f 100644
--- a/www/app/[domain]/transcripts/player.tsx
+++ b/www/app/[domain]/transcripts/player.tsx
@@ -3,10 +3,13 @@ import React, { useRef, useEffect, useState } from "react";
 import WaveSurfer from "wavesurfer.js";
 import RegionsPlugin from "wavesurfer.js/dist/plugins/regions.esm.js";
 
-import { formatTime } from "../../lib/time";
+import { formatTime, formatTimeMs } from "../../lib/time";
 import { Topic } from "./webSocketTypes";
 import { AudioWaveform } from "../../api";
 import { waveSurferStyles } from "../../styles/recorder";
+import { Box, Flex, IconButton } from "@chakra-ui/react";
+import PlayIcon from "../../styles/icons/play";
+import PauseIcon from "../../styles/icons/pause";
 
 type PlayerProps = {
   topics: Topic[];
@@ -27,25 +30,31 @@ export default function Player(props: PlayerProps) {
   const [waveRegions, setWaveRegions] = useState<RegionsPlugin | null>(null);
   const [activeTopic, setActiveTopic] = props.useActiveTopic;
   const topicsRef = useRef(props.topics);
+  const [firstRender, setFirstRender] = useState<boolean>(true);
+
+  const keyHandler = (e) => {
+    if (e.key == " ") {
+      wavesurfer?.playPause();
+    }
+  };
+  useEffect(() => {
+    document.addEventListener("keyup", keyHandler);
+    return () => {
+      document.removeEventListener("keyup", keyHandler);
+    };
+  });
+
   // Waveform setup
   useEffect(() => {
     if (waveformRef.current) {
-      // XXX duration is required to prevent recomputing peaks from audio
-      // However, the current waveform returns only the peaks, and no duration
-      // And the backend does not save duration properly.
-      // So at the moment, we deduct the duration from the topics.
-      // This is not ideal, but it works for now.
       const _wavesurfer = WaveSurfer.create({
         container: waveformRef.current,
-        peaks: props.waveform.data,
-        hideScrollbar: true,
-        autoCenter: true,
-        barWidth: 2,
+        peaks: [props.waveform.data],
         height: "auto",
         duration: Math.floor(props.mediaDuration / 1000),
         media: props.media,
 
-        ...waveSurferStyles.player,
+        ...waveSurferStyles.playerSettings,
       });
 
       // styling
@@ -84,8 +93,19 @@ export default function Player(props: PlayerProps) {
   }, [props.media, wavesurfer]);
 
   useEffect(() => {
+    if (!waveRegions) return;
+
     topicsRef.current = props.topics;
-    renderMarkers();
+    if (firstRender) {
+      setFirstRender(false);
+      // wait for the waveform to render, if you don't markers will be stacked on top of each other
+      // I tried to listen for the waveform to be ready but it didn't work
+      setTimeout(() => {
+        renderMarkers();
+      }, 300);
+    } else {
+      renderMarkers();
+    }
   }, [props.topics, waveRegions]);
 
   const renderMarkers = () => {
@@ -96,22 +116,28 @@ export default function Player(props: PlayerProps) {
     for (let topic of topicsRef.current) {
       const content = document.createElement("div");
       content.setAttribute("style", waveSurferStyles.marker);
-      content.onmouseover = () => {
+      content.onmouseover = (e) => {
         content.style.backgroundColor =
           waveSurferStyles.markerHover.backgroundColor;
-        content.style.zIndex = "999";
         content.style.width = "300px";
+        if (content.parentElement) {
+          content.parentElement.style.zIndex = "999";
+        }
       };
       content.onmouseout = () => {
         content.setAttribute("style", waveSurferStyles.marker);
+        if (content.parentElement) {
+          content.parentElement.style.zIndex = "0";
+        }
       };
       content.textContent = topic.title;
 
       const region = waveRegions.addRegion({
         start: topic.timestamp,
         content,
-        color: "f00",
         drag: false,
+        resize: false,
+        top: 0,
       });
       region.on("click", (e) => {
         e.stopPropagation();
@@ -132,32 +158,37 @@ export default function Player(props: PlayerProps) {
   };
 
   const timeLabel = () => {
-    if (props.mediaDuration)
-      return `${formatTime(currentTime)}/${formatTime(props.mediaDuration)}`;
+    if (props.mediaDuration && Math.floor(props.mediaDuration / 1000) > 0)
+      return `${formatTime(currentTime)}/${formatTimeMs(props.mediaDuration)}`;
     return "";
   };
 
   return (
-    <div className="flex items-center w-full relative">
-      <div className="flex-grow items-end relative">
-        <div
-          ref={waveformRef}
-          className="flex-grow rounded-lg md:rounded-xl h-20"
-        ></div>
-        <div className="absolute right-2 bottom-0">{timeLabel()}</div>
-      </div>
-
-      <button
-        className={`${
-          isPlaying
-            ? "bg-orange-400 hover:bg-orange-500 focus-visible:bg-orange-500"
-            : "bg-green-400 hover:bg-green-500 focus-visible:bg-green-500"
-        } text-white ml-2 md:ml:4 md:h-[78px] md:min-w-[100px] text-lg`}
+    <Flex className="flex items-center w-full relative">
+      <IconButton
+        aria-label={isPlaying ? "Pause" : "Play"}
+        icon={isPlaying ? <PauseIcon /> : <PlayIcon />}
+        variant={"ghost"}
+        colorScheme={"blue"}
+        mr={2}
         id="play-btn"
         onClick={handlePlayClick}
-      >
-        {isPlaying ? "Pause" : "Play"}
-      </button>
-    </div>
+      />
+
+      <Box position="relative" flex={1}>
+        <Box ref={waveformRef} height={14}></Box>
+        <Box
+          zIndex={50}
+          backgroundColor="rgba(255, 255, 255, 0.5)"
+          fontSize={"sm"}
+          shadow={"0px 0px 4px 0px white"}
+          position={"absolute"}
+          right={0}
+          bottom={0}
+        >
+          {timeLabel()}
+        </Box>
+      </Box>
+    </Flex>
   );
 }
diff --git a/www/app/[domain]/transcripts/recorder.tsx b/www/app/[domain]/transcripts/recorder.tsx
index 3ef96d62..d583bb74 100644
--- a/www/app/[domain]/transcripts/recorder.tsx
+++ b/www/app/[domain]/transcripts/recorder.tsx
@@ -3,39 +3,50 @@ import React, { useRef, useEffect, useState } from "react";
 import WaveSurfer from "wavesurfer.js";
 import RecordPlugin from "../../lib/custom-plugins/record";
 
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faMicrophone } from "@fortawesome/free-solid-svg-icons";
-
-import { formatTime } from "../../lib/time";
-import AudioInputsDropdown from "./audioInputsDropdown";
-import { Option } from "react-dropdown";
+import { formatTime, formatTimeMs } from "../../lib/time";
 import { waveSurferStyles } from "../../styles/recorder";
 import { useError } from "../../(errors)/errorContext";
 import FileUploadButton from "./fileUploadButton";
+import useWebRTC from "./useWebRTC";
+import useAudioDevice from "./useAudioDevice";
+import {
+  Box,
+  Flex,
+  IconButton,
+  Menu,
+  MenuButton,
+  MenuItemOption,
+  MenuList,
+  MenuOptionGroup,
+} from "@chakra-ui/react";
+import StopRecordIcon from "../../styles/icons/stopRecord";
+import PlayIcon from "../../styles/icons/play";
+import { LuScreenShare } from "react-icons/lu";
+import { FaMicrophone } from "react-icons/fa";
 
 type RecorderProps = {
-  setStream: React.Dispatch<React.SetStateAction<MediaStream | null>>;
-  onStop: () => void;
-  onRecord?: () => void;
-  getAudioStream: (deviceId) => Promise<MediaStream | null>;
-  audioDevices: Option[];
   transcriptId: string;
+  status: string;
 };
 
 export default function Recorder(props: RecorderProps) {
   const waveformRef = useRef<HTMLDivElement>(null);
-  const [wavesurfer, setWavesurfer] = useState<WaveSurfer | null>(null);
   const [record, setRecord] = useState<RecordPlugin | null>(null);
   const [isRecording, setIsRecording] = useState<boolean>(false);
-  const [hasRecorded, setHasRecorded] = useState<boolean>(false);
-  const [isPlaying, setIsPlaying] = useState<boolean>(false);
-  const [currentTime, setCurrentTime] = useState<number>(0);
-  const [timeInterval, setTimeInterval] = useState<number | null>(null);
+
   const [duration, setDuration] = useState<number>(0);
   const [deviceId, setDeviceId] = useState<string | null>(null);
-  const [recordStarted, setRecordStarted] = useState(false);
-  const [showDevices, setShowDevices] = useState(false);
   const { setError } = useError();
+  const [stream, setStream] = useState<MediaStream | null>(null);
+
+  // Time tracking, iirc it was drifting without this. to be tested again.
+  const [startTime, setStartTime] = useState(0);
+  const [currentTime, setCurrentTime] = useState<number>(0);
+  const [timeInterval, setTimeInterval] = useState<number | null>(null);
+
+  const webRTC = useWebRTC(stream, props.transcriptId);
+
+  const { audioDevices, getAudioStream } = useAudioDevice();
 
   // Function used to setup keyboard shortcuts for the streamdeck
   const setupProjectorKeys = (): (() => void) => {
@@ -106,22 +117,13 @@ export default function Recorder(props: RecorderProps) {
         waveSurferStyles.playerStyle.backgroundColor;
       wsWrapper.style.borderRadius = waveSurferStyles.playerStyle.borderRadius;
 
-      _wavesurfer.on("play", () => {
-        setIsPlaying(true);
-      });
-      _wavesurfer.on("pause", () => {
-        setIsPlaying(false);
-      });
       _wavesurfer.on("timeupdate", setCurrentTime);
 
       setRecord(_wavesurfer.registerPlugin(RecordPlugin.create()));
 
-      setWavesurfer(_wavesurfer);
-
       return () => {
         _wavesurfer.destroy();
         setIsRecording(false);
-        setIsPlaying(false);
         setCurrentTime(0);
       };
     }
@@ -130,7 +132,7 @@ export default function Recorder(props: RecorderProps) {
   useEffect(() => {
     if (isRecording) {
       const interval = window.setInterval(() => {
-        setCurrentTime((prev) => prev + 1);
+        setCurrentTime(Date.now() - startTime);
       }, 1000);
       setTimeInterval(interval);
       return () => clearInterval(interval);
@@ -147,20 +149,20 @@ export default function Recorder(props: RecorderProps) {
     if (!record) return console.log("no record");
 
     if (record.isRecording()) {
-      if (props.onStop) props.onStop();
+      setStream(null);
+      webRTC?.send(JSON.stringify({ cmd: "STOP" }));
       record.stopRecording();
       if (screenMediaStream) {
         screenMediaStream.getTracks().forEach((t) => t.stop());
       }
       setIsRecording(false);
-      setHasRecorded(true);
       setScreenMediaStream(null);
       setDestinationStream(null);
     } else {
-      if (props.onRecord) props.onRecord();
-      const stream = await getCurrentStream();
+      const stream = await getMicrophoneStream();
+      setStartTime(Date.now());
 
-      if (props.setStream) props.setStream(stream);
+      setStream(stream);
       if (stream) {
         await record.startRecording(stream);
         setIsRecording(true);
@@ -198,7 +200,7 @@ export default function Recorder(props: RecorderProps) {
     if (destinationStream !== null) return console.log("already recording");
 
     // connect mic audio (microphone)
-    const micStream = await getCurrentStream();
+    const micStream = await getMicrophoneStream();
     if (!micStream) {
       console.log("no microphone audio");
       return;
@@ -227,7 +229,7 @@ export default function Recorder(props: RecorderProps) {
   useEffect(() => {
     if (!record) return;
     if (!destinationStream) return;
-    if (props.setStream) props.setStream(destinationStream);
+    setStream(destinationStream);
     if (destinationStream) {
       record.startRecording(destinationStream);
       setIsRecording(true);
@@ -238,115 +240,87 @@ export default function Recorder(props: RecorderProps) {
     startTabRecording();
   }, [record, screenMediaStream]);
 
-  const handlePlayClick = () => {
-    wavesurfer?.playPause();
-  };
-
   const timeLabel = () => {
-    if (isRecording) return formatTime(currentTime);
-    if (duration) return `${formatTime(currentTime)}/${formatTime(duration)}`;
+    if (isRecording) return formatTimeMs(currentTime);
+    if (duration) return `${formatTimeMs(currentTime)}/${formatTime(duration)}`;
     return "";
   };
 
-  const getCurrentStream = async () => {
-    setRecordStarted(true);
-    return deviceId && props.getAudioStream
-      ? await props.getAudioStream(deviceId)
-      : null;
+  const getMicrophoneStream = async () => {
+    return deviceId && getAudioStream ? await getAudioStream(deviceId) : null;
   };
 
   useEffect(() => {
-    if (props.audioDevices && props.audioDevices.length > 0) {
-      setDeviceId(props.audioDevices[0].value);
+    if (audioDevices && audioDevices.length > 0) {
+      setDeviceId(audioDevices[0].value);
     }
-  }, [props.audioDevices]);
+  }, [audioDevices]);
 
   return (
-    <div className="flex items-center w-full relative">
-      <div className="flex-grow items-end relative">
-        <div
-          ref={waveformRef}
-          className="flex-grow rounded-lg md:rounded-xl h-20"
-        ></div>
-        <div className="absolute right-2 bottom-0">
-          {isRecording && (
-            <div className="inline-block bg-red-500 rounded-full w-2 h-2 my-auto mr-1 animate-ping"></div>
-          )}
+    <Flex className="flex items-center w-full relative">
+      <IconButton
+        aria-label={isRecording ? "Stop" : "Record"}
+        icon={isRecording ? <StopRecordIcon /> : <PlayIcon />}
+        variant={"ghost"}
+        colorScheme={"blue"}
+        mr={2}
+        onClick={handleRecClick}
+      />
+      <FileUploadButton
+        transcriptId={props.transcriptId}
+        disabled={isRecording}
+      ></FileUploadButton>
+      {!isRecording && (window as any).chrome && (
+        <IconButton
+          aria-label={"Record Tab"}
+          icon={<LuScreenShare />}
+          variant={"ghost"}
+          colorScheme={"blue"}
+          disabled={isRecording}
+          mr={2}
+          onClick={handleRecordTabClick}
+        />
+      )}
+      {audioDevices && audioDevices?.length > 0 && deviceId && !isRecording && (
+        <Menu>
+          <MenuButton
+            as={IconButton}
+            aria-label={"Switch microphone"}
+            icon={<FaMicrophone />}
+            variant={"ghost"}
+            disabled={isRecording}
+            colorScheme={"blue"}
+            mr={2}
+          />
+          <MenuList>
+            <MenuOptionGroup defaultValue={audioDevices[0].value} type="radio">
+              {audioDevices.map((device) => (
+                <MenuItemOption
+                  key={device.value}
+                  value={device.value}
+                  onClick={() => setDeviceId(device.value)}
+                >
+                  {device.label}
+                </MenuItemOption>
+              ))}
+            </MenuOptionGroup>
+          </MenuList>
+        </Menu>
+      )}
+      <Box position="relative" flex={1}>
+        <Box ref={waveformRef} height={14}></Box>
+        <Box
+          zIndex={50}
+          backgroundColor="rgba(255, 255, 255, 0.5)"
+          fontSize={"sm"}
+          shadow={"0px 0px 4px 0px white"}
+          position={"absolute"}
+          right={0}
+          bottom={0}
+        >
           {timeLabel()}
-        </div>
-      </div>
-
-      {hasRecorded && (
-        <>
-          <button
-            className={`${
-              isPlaying
-                ? "bg-orange-400 hover:bg-orange-500 focus-visible:bg-orange-500"
-                : "bg-green-400 hover:bg-green-500 focus-visible:bg-green-500"
-            } text-white ml-2 md:ml:4 md:h-[78px] md:min-w-[100px] text-lg`}
-            id="play-btn"
-            onClick={handlePlayClick}
-          >
-            {isPlaying ? "Pause" : "Play"}
-          </button>
-        </>
-      )}
-      {!hasRecorded && (
-        <>
-          <button
-            className={`${
-              isRecording
-                ? "bg-red-400 hover:bg-red-500 focus-visible:bg-red-500"
-                : "bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500"
-            } text-white ml-2 md:ml:4 md:h-[78px] md:min-w-[100px] text-lg`}
-            onClick={handleRecClick}
-            disabled={isPlaying}
-          >
-            {isRecording ? "Stop" : "Record"}
-          </button>
-
-          <FileUploadButton
-            transcriptId={props.transcriptId}
-          ></FileUploadButton>
-
-          {!isRecording && (
-            <button
-              className={`${
-                isRecording
-                  ? "bg-red-400 hover:bg-red-500 focus-visible:bg-red-500"
-                  : "bg-blue-400 hover:bg-blue-500 focus-visible:bg-blue-500"
-              } text-white ml-2 md:ml:4 md:h-[78px] md:min-w-[100px] text-lg`}
-              onClick={handleRecordTabClick}
-            >
-              Record
-              <br />a tab
-            </button>
-          )}
-          {props.audioDevices && props.audioDevices?.length > 0 && deviceId && (
-            <>
-              <button
-                className="text-center text-blue-400 hover:text-blue-700 ml-2 md:ml:4 p-2 rounded-lg focus-visible:outline outline-blue-400"
-                onClick={() => setShowDevices((prev) => !prev)}
-              >
-                <FontAwesomeIcon icon={faMicrophone} className="h-5 w-auto" />
-              </button>
-              <div
-                className={`absolute z-20 bottom-[-1rem] right-0 bg-white rounded ${
-                  showDevices ? "visible" : "invisible"
-                }`}
-              >
-                <AudioInputsDropdown
-                  setDeviceId={setDeviceId}
-                  audioDevices={props.audioDevices}
-                  disabled={recordStarted}
-                  hide={() => setShowDevices(false)}
-                  deviceId={deviceId}
-                />
-              </div>
-            </>
-          )}
-        </>
-      )}
-    </div>
+        </Box>
+      </Box>
+    </Flex>
   );
 }
diff --git a/www/app/[domain]/transcripts/shareAndPrivacy.tsx b/www/app/[domain]/transcripts/shareAndPrivacy.tsx
new file mode 100644
index 00000000..864a66ab
--- /dev/null
+++ b/www/app/[domain]/transcripts/shareAndPrivacy.tsx
@@ -0,0 +1,149 @@
+import { useEffect, useState } from "react";
+import { featureEnabled } from "../domainContext";
+
+import { ShareMode, toShareMode } from "../../lib/shareMode";
+import { GetTranscript, GetTranscriptTopic, UpdateTranscript } from "../../api";
+import {
+  Box,
+  Flex,
+  IconButton,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  Text,
+} from "@chakra-ui/react";
+import { FaShare } from "react-icons/fa";
+import { useFiefUserinfo } from "@fief/fief/build/esm/nextjs/react";
+import useApi from "../../lib/useApi";
+import { Select } from "chakra-react-select";
+import ShareLink from "./shareLink";
+import ShareCopy from "./shareCopy";
+import ShareZulip from "./shareZulip";
+
+type ShareAndPrivacyProps = {
+  finalSummaryRef: any;
+  transcriptResponse: GetTranscript;
+  topicsResponse: GetTranscriptTopic[];
+};
+
+type ShareOption = { value: ShareMode; label: string };
+
+const shareOptions = [
+  { label: "Private", value: toShareMode("private") },
+  { label: "Secure", value: toShareMode("semi-private") },
+  { label: "Public", value: toShareMode("public") },
+];
+
+export default function ShareAndPrivacy(props: ShareAndPrivacyProps) {
+  const [showModal, setShowModal] = useState(false);
+  const [isOwner, setIsOwner] = useState(false);
+  const [shareMode, setShareMode] = useState<ShareOption>(
+    shareOptions.find(
+      (option) => option.value === props.transcriptResponse.share_mode
+    ) || shareOptions[0]
+  );
+  const [shareLoading, setShareLoading] = useState(false);
+  const requireLogin = featureEnabled("requireLogin");
+  const api = useApi();
+
+  const updateShareMode = async (selectedShareMode: any) => {
+    if (!api)
+      throw new Error("ShareLink's API should always be ready at this point");
+
+    setShareLoading(true);
+    const requestBody: UpdateTranscript = {
+      share_mode: toShareMode(selectedShareMode.value),
+    };
+
+    const updatedTranscript = await api.v1TranscriptUpdate(
+      props.transcriptResponse.id,
+      requestBody
+    );
+    setShareMode(
+      shareOptions.find(
+        (option) => option.value === updatedTranscript.share_mode
+      ) || shareOptions[0]
+    );
+    setShareLoading(false);
+  };
+
+  const userId = useFiefUserinfo()?.sub;
+
+  useEffect(() => {
+    setIsOwner(!!(requireLogin && userId === props.transcriptResponse.user_id));
+  }, [userId, props.transcriptResponse.user_id]);
+
+  return (
+    <>
+      <IconButton
+        icon={<FaShare />}
+        onClick={() => setShowModal(true)}
+        aria-label="Share"
+      />
+      <Modal
+        isOpen={!!showModal}
+        onClose={() => setShowModal(false)}
+        size={"xl"}
+      >
+        <ModalOverlay />
+        <ModalContent>
+          <ModalHeader>Share</ModalHeader>
+          <ModalBody>
+            {requireLogin && (
+              <Box mb={4}>
+                <Text size="sm" mb="2" fontWeight={"bold"}>
+                  Share mode
+                </Text>
+                <Text size="sm" mb="2">
+                  {shareMode.value === "private" &&
+                    "This transcript is private and can only be accessed by you."}
+                  {shareMode.value === "semi-private" &&
+                    "This transcript is secure. Only authenticated users can access it."}
+                  {shareMode.value === "public" &&
+                    "This transcript is public. Everyone can access it."}
+                </Text>
+
+                {isOwner && api && (
+                  <Select
+                    options={
+                      [
+                        { value: "private", label: "Private" },
+                        { label: "Secure", value: "semi-private" },
+                        { label: "Public", value: "public" },
+                      ] as any
+                    }
+                    value={shareMode}
+                    onChange={updateShareMode}
+                    isLoading={shareLoading}
+                  />
+                )}
+              </Box>
+            )}
+
+            <Text size="sm" mb="2" fontWeight={"bold"}>
+              Share options
+            </Text>
+            <Flex gap={2} mb={2}>
+              {requireLogin && (
+                <ShareZulip
+                  transcriptResponse={props.transcriptResponse}
+                  topicsResponse={props.topicsResponse}
+                  disabled={toShareMode(shareMode.value) === "private"}
+                />
+              )}
+              <ShareCopy
+                finalSummaryRef={props.finalSummaryRef}
+                transcriptResponse={props.transcriptResponse}
+                topicsResponse={props.topicsResponse}
+              />
+            </Flex>
+
+            <ShareLink transcriptId={props.transcriptResponse.id} />
+          </ModalBody>
+        </ModalContent>
+      </Modal>
+    </>
+  );
+}
diff --git a/www/app/[domain]/transcripts/shareCopy.tsx b/www/app/[domain]/transcripts/shareCopy.tsx
new file mode 100644
index 00000000..bdc0c337
--- /dev/null
+++ b/www/app/[domain]/transcripts/shareCopy.tsx
@@ -0,0 +1,62 @@
+import { useState } from "react";
+import { GetTranscript, GetTranscriptTopic } from "../../api";
+import { Button, BoxProps, Box } from "@chakra-ui/react";
+
+type ShareCopyProps = {
+  finalSummaryRef: any;
+  transcriptResponse: GetTranscript;
+  topicsResponse: GetTranscriptTopic[];
+};
+
+export default function ShareCopy({
+  finalSummaryRef,
+  transcriptResponse,
+  topicsResponse,
+  ...boxProps
+}: ShareCopyProps & BoxProps) {
+  const [isCopiedSummary, setIsCopiedSummary] = useState(false);
+  const [isCopiedTranscript, setIsCopiedTranscript] = useState(false);
+
+  const onCopySummaryClick = () => {
+    let text_to_copy = finalSummaryRef.current?.innerText;
+
+    text_to_copy &&
+      navigator.clipboard.writeText(text_to_copy).then(() => {
+        setIsCopiedSummary(true);
+        // Reset the copied state after 2 seconds
+        setTimeout(() => setIsCopiedSummary(false), 2000);
+      });
+  };
+
+  const onCopyTranscriptClick = () => {
+    let text_to_copy =
+      topicsResponse
+        ?.map((topic) => topic.transcript)
+        .join("\n\n")
+        .replace(/ +/g, " ")
+        .trim() || "";
+
+    text_to_copy &&
+      navigator.clipboard.writeText(text_to_copy).then(() => {
+        setIsCopiedTranscript(true);
+        // Reset the copied state after 2 seconds
+        setTimeout(() => setIsCopiedTranscript(false), 2000);
+      });
+  };
+
+  return (
+    <Box {...boxProps}>
+      <Button
+        onClick={onCopyTranscriptClick}
+        colorScheme="blue"
+        size={"sm"}
+        mr={2}
+      >
+        {isCopiedTranscript ? "Copied!" : "Copy Transcript"}
+      </Button>
+      <Button onClick={onCopySummaryClick} colorScheme="blue" size={"sm"}>
+        {isCopiedSummary ? "Copied!" : "Copy Summary"}
+      </Button>
+    </Box>
+  );
+}
diff --git a/www/app/[domain]/transcripts/shareLink.tsx b/www/app/[domain]/transcripts/shareLink.tsx
index 7e0d592d..7bc38ac1 100644
--- a/www/app/[domain]/transcripts/shareLink.tsx
+++ b/www/app/[domain]/transcripts/shareLink.tsx
@@ -1,19 +1,10 @@
 import React, { useState, useRef, useEffect, use } from "react";
 import { featureEnabled } from "../domainContext";
-import { useFiefUserinfo } from "@fief/fief/nextjs/react";
-import SelectSearch from "react-select-search";
-import "react-select-search/style.css";
-import "../../styles/button.css";
-import "../../styles/form.scss";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faSpinner } from "@fortawesome/free-solid-svg-icons";
-import { UpdateTranscript } from "../../api";
-import { ShareMode, toShareMode } from "../../lib/shareMode";
-import useApi from "../../lib/useApi";
+import { Button, Flex, Input, Text } from "@chakra-ui/react";
+import QRCode from "react-qr-code";
+
 type ShareLinkProps = {
   transcriptId: string;
-  userId: string | null;
-  shareMode: ShareMode;
 };
 
 const ShareLink = (props: ShareLinkProps) => {
@@ -21,20 +12,12 @@ const ShareLink = (props: ShareLinkProps) => {
   const inputRef = useRef<HTMLInputElement>(null);
   const [currentUrl, setCurrentUrl] = useState<string>("");
   const requireLogin = featureEnabled("requireLogin");
-  const [isOwner, setIsOwner] = useState(false);
-  const [shareMode, setShareMode] = useState<ShareMode>(props.shareMode);
-  const [shareLoading, setShareLoading] = useState(false);
-  const userinfo = useFiefUserinfo();
-  const api = useApi();
+  const privacyEnabled = featureEnabled("privacy");
 
   useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
 
-  useEffect(() => {
-    setIsOwner(!!(requireLogin && userinfo?.sub === props.userId));
-  }, [userinfo, props.userId]);
-
   const handleCopyClick = () => {
     if (inputRef.current) {
       let text_to_copy = inputRef.current.value;
@@ -48,105 +31,43 @@ const ShareLink = (props: ShareLinkProps) => {
     }
   };
 
-  const updateShareMode = async (selectedShareMode: string) => {
-    if (!api)
-      throw new Error("ShareLink's API should always be ready at this point");
-
-    setShareLoading(true);
-    const requestBody: UpdateTranscript = {
-      share_mode: toShareMode(selectedShareMode),
-    };
-
-    const updatedTranscript = await api.v1TranscriptUpdate(
-      props.transcriptId,
-      requestBody,
-    );
-    setShareMode(toShareMode(updatedTranscript.share_mode));
-    setShareLoading(false);
-  };
-  const privacyEnabled = featureEnabled("privacy");
-
   return (
-    <div
-      className="p-2 md:p-4 rounded"
-      style={{ background: "rgba(96, 165, 250, 0.2)" }}
-    >
-      {requireLogin && (
-        <div className="text-sm mb-2">
-          {shareMode === "private" && (
-            <p>This transcript is private and can only be accessed by you.</p>
-          )}
-          {shareMode === "semi-private" && (
-            <p>
-              This transcript is secure. Only authenticated users can access it.
-            </p>
-          )}
-          {shareMode === "public" && (
-            <p>This transcript is public. Everyone can access it.</p>
-          )}
-
-          {isOwner && api && (
-            <div className="relative">
-              <SelectSearch
-                className="select-search--top select-search"
-                options={[
-                  { name: "Private", value: "private" },
-                  { name: "Secure", value: "semi-private" },
-                  { name: "Public", value: "public" },
-                ]}
-                value={shareMode?.toString()}
-                onChange={updateShareMode}
-                closeOnSelect={true}
-              />
-              {shareLoading && (
-                <div className="h-4 w-4 absolute top-1/3 right-3 z-10">
-                  <FontAwesomeIcon
-                    icon={faSpinner}
-                    className="animate-spin-slow text-gray-600 flex-grow rounded-lg md:rounded-xl h-4 w-4"
-                  />
-                </div>
-              )}
-            </div>
-          )}
-        </div>
-      )}
+    <>
       {!requireLogin && (
         <>
           {privacyEnabled ? (
-            <p className="text-sm mb-2">
+            <Text>
               Share this link to grant others access to this page. The link
               includes the full audio recording and is valid for the next 7
               days.
-            </p>
+            </Text>
           ) : (
-            <p className="text-sm mb-2">
+            <Text>
               Share this link to allow others to view this page and listen to
               the full audio recording.
-            </p>
+            </Text>
           )}
         </>
       )}
-      <div className="flex items-center">
-        <input
+      <Flex align={"center"}>
+        <QRCode
+          value={`${location.origin}/transcripts/${props.transcriptId}`}
+          level="L"
+          size={98}
+        />
+        <Input
           type="text"
           readOnly
           value={currentUrl}
           ref={inputRef}
           onChange={() => {}}
-          className="border rounded-lg md:rounded-xl p-2 flex-grow flex-shrink overflow-auto mr-2 text-sm bg-slate-100 outline-slate-400"
+          mx="2"
         />
-        <button
-          onClick={handleCopyClick}
-          className={
-            (isCopied ? "bg-blue-500" : "bg-blue-400") +
-            " hover:bg-blue-500 focus-visible:bg-blue-500 text-white rounded p-2"
-          }
-          style={{ minHeight: "38px" }}
-        >
+        <Button onClick={handleCopyClick} colorScheme="blue">
           {isCopied ? "Copied!" : "Copy"}
-        </button>
-      </div>
-    </div>
+        </Button>
+      </Flex>
+    </>
   );
 };
 
diff --git a/www/app/[domain]/transcripts/shareZulip.tsx b/www/app/[domain]/transcripts/shareZulip.tsx
new file mode 100644
index 00000000..e7c2c092
--- /dev/null
+++ b/www/app/[domain]/transcripts/shareZulip.tsx
@@ -0,0 +1,36 @@
+import { useState } from "react";
+import { featureEnabled } from "../domainContext";
+import ShareModal from "./[transcriptId]/shareModal";
+import { GetTranscript, GetTranscriptTopic } from "../../api";
+import { BoxProps, Button } from "@chakra-ui/react";
+
+type ShareZulipProps = {
+  transcriptResponse: GetTranscript;
+  topicsResponse: GetTranscriptTopic[];
+  disabled: boolean;
+};
+
+export default function ShareZulip(props: ShareZulipProps & BoxProps) {
+  const [showModal, setShowModal] = useState(false);
+  if (!featureEnabled("sendToZulip")) return null;
+
+  return (
+    <>
+      <Button
+        colorScheme="blue"
+        size={"sm"}
+        isDisabled={props.disabled}
+        onClick={() => setShowModal(true)}
+      >
+        ➡️ Send to Zulip
+      </Button>
+
+      <ShareModal
+        transcript={props.transcriptResponse}
+        topics={props.topicsResponse}
+        show={showModal}
+        setShow={(v) => setShowModal(v)}
+      />
+    </>
+  );
+}
diff --git a/www/app/[domain]/transcripts/topicList.tsx b/www/app/[domain]/transcripts/topicList.tsx
index 17b6e5a9..2a3bbfc6 100644
--- a/www/app/[domain]/transcripts/topicList.tsx
+++ b/www/app/[domain]/transcripts/topicList.tsx
@@ -1,14 +1,20 @@
 import React, { useState, useEffect } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faChevronRight,
-  faChevronDown,
-} from "@fortawesome/free-solid-svg-icons";
 import { formatTime } from "../../lib/time";
 import ScrollToBottom from "./scrollToBottom";
 import { Topic } from "./webSocketTypes";
 import { generateHighContrastColor } from "../../lib/utils";
 import useParticipants from "./useParticipants";
+import {
+  Accordion,
+  AccordionButton,
+  AccordionIcon,
+  AccordionItem,
+  AccordionPanel,
+  Box,
+  Flex,
+  Text,
+} from "@chakra-ui/react";
+import { featureEnabled } from "../domainContext";
 
 type TopicListProps = {
   topics: Topic[];
@@ -18,6 +24,8 @@ type TopicListProps = {
   ];
   autoscroll: boolean;
   transcriptId: string;
+  status: string;
+  currentTranscriptText: any;
 };
 
 export function TopicList({
@@ -25,27 +33,37 @@ export function TopicList({
   useActiveTopic,
   autoscroll,
   transcriptId,
+  status,
+  currentTranscriptText,
 }: TopicListProps) {
   const [activeTopic, setActiveTopic] = useActiveTopic;
   const [autoscrollEnabled, setAutoscrollEnabled] = useState<boolean>(true);
   const participants = useParticipants(transcriptId);
 
-  useEffect(() => {
-    if (autoscroll && autoscrollEnabled) scrollToBottom();
-  }, [topics.length]);
+  const scrollToTopic = () => {
+    const topicDiv = document.getElementById(
+      `accordion-button-topic-${activeTopic?.id}`
+    );
 
-  const scrollToBottom = () => {
-    const topicsDiv = document.getElementById("topics-div");
-
-    if (topicsDiv) topicsDiv.scrollTop = topicsDiv.scrollHeight;
+    setTimeout(() => {
+      topicDiv?.scrollIntoView({
+        behavior: "smooth",
+        block: "start",
+        inline: "nearest",
+      });
+    }, 200);
   };
 
+  useEffect(() => {
+    if (activeTopic) scrollToTopic();
+  }, [activeTopic]);
+
   // scroll top is not rounded, heights are, so exact match won't work.
   // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#determine_if_an_element_has_been_totally_scrolled
   const toggleScroll = (element) => {
     const bottom =
       Math.abs(
-        element.scrollHeight - element.clientHeight - element.scrollTop,
+        element.scrollHeight - element.clientHeight - element.scrollTop
       ) < 2 || element.scrollHeight == element.clientHeight;
     if (!bottom && autoscrollEnabled) {
       setAutoscrollEnabled(false);
@@ -59,108 +77,187 @@ export function TopicList({
 
   useEffect(() => {
     if (autoscroll) {
-      const topicsDiv = document.getElementById("topics-div");
+      const topicsDiv = document.getElementById("scroll-div");
 
       topicsDiv && toggleScroll(topicsDiv);
     }
   }, [activeTopic, autoscroll]);
 
+  useEffect(() => {
+    if (autoscroll && autoscrollEnabled) scrollToBottom();
+  }, [topics.length, currentTranscriptText]);
+
+  const scrollToBottom = () => {
+    const topicsDiv = document.getElementById("scroll-div");
+
+    if (topicsDiv) topicsDiv.scrollTop = topicsDiv.scrollHeight;
+  };
+
   const getSpeakerName = (speakerNumber: number) => {
     if (!participants.response) return;
     return (
       participants.response.find(
-        (participant) => participant.speaker == speakerNumber,
+        (participant) => participant.speaker == speakerNumber
       )?.name || `Speaker ${speakerNumber}`
     );
   };
 
+  const requireLogin = featureEnabled("requireLogin");
+
+  useEffect(() => {
+    setActiveTopic(topics[topics.length - 1]);
+  }, [topics]);
+
+  useEffect(() => {
+    if (activeTopic && currentTranscriptText) setActiveTopic(null);
+  }, [activeTopic, currentTranscriptText]);
+
   return (
-    <section className="relative w-full h-full bg-blue-400/20 rounded-lg md:rounded-xl p-1 sm:p-2 md:px-4 flex flex-col justify-center align-center">
-      {topics.length > 0 ? (
-        <>
-          <h2 className="ml-2 md:text-lg font-bold mb-2">Topics</h2>
+    <Flex
+      position={"relative"}
+      w={"100%"}
+      h={"100%"}
+      flexDirection={"column"}
+      justify={"center"}
+      align={"center"}
+      flexShrink={0}
+    >
+      {autoscroll && (
+        <ScrollToBottom
+          visible={!autoscrollEnabled}
+          handleScrollBottom={scrollToBottom}
+        />
+      )}
 
-          {autoscroll && (
-            <ScrollToBottom
-              visible={!autoscrollEnabled}
-              handleScrollBottom={scrollToBottom}
-            />
-          )}
-
-          <div
-            id="topics-div"
-            className="overflow-y-auto h-full"
-            onScroll={handleScroll}
+      <Box
+        id="scroll-div"
+        overflowY={"auto"}
+        h={"100%"}
+        onScroll={handleScroll}
+        width="full"
+        padding={2}
+      >
+        {topics.length > 0 && (
+          <Accordion
+            index={topics.findIndex((topic) => topic.id == activeTopic?.id)}
+            variant="custom"
+            allowToggle
           >
             {topics.map((topic, index) => (
-              <button
+              <AccordionItem
                 key={index}
-                className="rounded-none border-solid border-0 border-bluegrey border-b last:border-none last:rounded-b-lg p-2 hover:bg-blue-400/20 focus-visible:bg-blue-400/20 text-left block w-full"
-                onClick={() =>
-                  setActiveTopic(activeTopic?.id == topic.id ? null : topic)
-                }
+                background={{
+                  base: "light",
+                  hover: "gray.100",
+                  focus: "gray.100",
+                }}
+                id={`topic-${topic.id}`}
               >
-                <div className="w-full flex justify-between items-center rounded-lg md:rounded-xl xs:text-base sm:text-lg md:text-xl font-bold leading-tight">
-                  <p>
-                    <span className="font-light font-mono text-slate-500 text-base md:text-lg">
-                      [{formatTime(topic.timestamp)}]&nbsp;
-                    </span>
-                    <span>{topic.title}</span>
-                  </p>
-                  <FontAwesomeIcon
-                    className="transform transition-transform duration-200 ml-2"
-                    icon={
-                      activeTopic?.id == topic.id
-                        ? faChevronDown
-                        : faChevronRight
-                    }
-                  />
-                </div>
-                {activeTopic?.id == topic.id && (
-                  <div className="p-2">
-                    {topic.segments ? (
-                      <>
-                        {topic.segments.map((segment, index: number) => (
-                          <p
-                            key={index}
-                            className="text-left text-slate-500 text-sm md:text-base"
+                <Flex dir="row" letterSpacing={".2"}>
+                  <AccordionButton
+                    onClick={() => {
+                      setActiveTopic(
+                        activeTopic?.id == topic.id ? null : topic
+                      );
+                    }}
+                  >
+                    <AccordionIcon />
+                    <Box as="span" textAlign="left" ml="1">
+                      {topic.title}{" "}
+                      <Text
+                        as="span"
+                        color="gray.500"
+                        fontSize="sm"
+                        fontWeight="bold"
+                      >
+                        &nbsp;[{formatTime(topic.timestamp)}]&nbsp;-&nbsp;[
+                        {formatTime(topic.timestamp + (topic.duration || 0))}]
+                      </Text>
+                    </Box>
+                  </AccordionButton>
+                </Flex>
+                <AccordionPanel>
+                  {topic.segments ? (
+                    <>
+                      {topic.segments.map((segment, index: number) => (
+                        <Text
+                          key={index}
+                          className="text-left text-slate-500 text-sm md:text-base"
+                          pb={2}
+                          lineHeight={"1.3"}
+                        >
+                          <Text
+                            as="span"
+                            color={"gray.500"}
+                            fontFamily={"monospace"}
+                            fontSize={"sm"}
                           >
-                            <span className="font-mono text-slate-500">
-                              [{formatTime(segment.start)}]
-                            </span>
-                            <span
-                              className="font-bold text-slate-500"
-                              style={{
-                                color: generateHighContrastColor(
-                                  `Speaker ${segment.speaker}`,
-                                  [96, 165, 250],
-                                ),
-                              }}
-                            >
-                              {" "}
-                              {getSpeakerName(segment.speaker)}:
-                            </span>{" "}
-                            <span>{segment.text}</span>
-                          </p>
-                        ))}
-                      </>
-                    ) : (
-                      <>{topic.transcript}</>
-                    )}
-                  </div>
-                )}
-              </button>
+                            [{formatTime(segment.start)}]
+                          </Text>
+                          <Text
+                            as="span"
+                            fontWeight={"bold"}
+                            fontSize={"sm"}
+                            color={generateHighContrastColor(
+                              `Speaker ${segment.speaker}`,
+                              [96, 165, 250]
+                            )}
+                          >
+                            {" "}
+                            {getSpeakerName(segment.speaker)}:
+                          </Text>{" "}
+                          <span>{segment.text}</span>
+                        </Text>
+                      ))}
+                    </>
+                  ) : (
+                    <>{topic.transcript}</>
+                  )}
+                </AccordionPanel>
+              </AccordionItem>
             ))}
-          </div>
-        </>
-      ) : (
-        <div className="text-center text-gray-500">
-          Discussion topics will appear here after you start recording.
-          <br />
-          It may take up to 5 minutes of conversation for the first topic to
-          appear.
-        </div>
-      )}
-    </section>
+          </Accordion>
+        )}
+
+        {status == "recording" && (
+          <Box textAlign={"center"}>
+            <Text>{currentTranscriptText}</Text>
+          </Box>
+        )}
+        {(status == "recording" || status == "idle") &&
+          currentTranscriptText.length == 0 &&
+          topics.length == 0 && (
+            <Box textAlign={"center"} textColor="gray">
+              <Text>
+                Discussion transcript will appear here after you start
+                recording.
+              </Text>
+              <Text>
+                It may take up to 5 minutes of conversation to first appear.
+              </Text>
+            </Box>
+          )}
+        {status == "processing" && (
+          <Box textAlign={"center"} textColor="gray">
+            <Text>We are processing the recording, please wait.</Text>
+            {!requireLogin && (
+              <span>
+                Please do not navigate away from the page during this time.
+              </span>
+            )}
+          </Box>
+        )}
+        {status == "ended" && topics.length == 0 && (
+          <Box textAlign={"center"} textColor="gray">
+            <Text>Recording has ended without topics being found.</Text>
+          </Box>
+        )}
+        {status == "error" && (
+          <Box textAlign={"center"} textColor="gray">
+            <Text>There was an error processing your recording</Text>
+          </Box>
+        )}
+      </Box>
+    </Flex>
   );
 }
diff --git a/www/app/[domain]/transcripts/transcriptTitle.tsx b/www/app/[domain]/transcripts/transcriptTitle.tsx
index fa456049..14ce7c97 100644
--- a/www/app/[domain]/transcripts/transcriptTitle.tsx
+++ b/www/app/[domain]/transcripts/transcriptTitle.tsx
@@ -1,6 +1,8 @@
 import { useState } from "react";
 import { UpdateTranscript } from "../../api";
 import useApi from "../../lib/useApi";
+import { Heading, IconButton, Input } from "@chakra-ui/react";
+import { FaPen } from "react-icons/fa";
 
 type TranscriptTitle = {
   title: string;
@@ -19,7 +21,6 @@ const TranscriptTitle = (props: TranscriptTitle) => {
       const requestBody: UpdateTranscript = {
         title: newTitle,
       };
-      const api = useApi();
       const updatedTranscript = await api?.v1TranscriptUpdate(
         transcriptId,
         requestBody,
@@ -46,6 +47,12 @@ const TranscriptTitle = (props: TranscriptTitle) => {
     }
   };
 
+  const handleBlur = () => {
+    if (displayedTitle !== preEditTitle) {
+      updateTitle(displayedTitle, props.transcriptId);
+    }
+    setIsEditing(false);
+  };
   const handleChange = (e) => {
     setDisplayedTitle(e.target.value);
   };
@@ -63,21 +70,36 @@ const TranscriptTitle = (props: TranscriptTitle) => {
   return (
     <>
       {isEditing ? (
-        <input
+        <Input
           type="text"
           value={displayedTitle}
           onChange={handleChange}
           onKeyDown={handleKeyDown}
           autoFocus
-          className="text-2xl lg:text-4xl font-extrabold text-center mb-4 w-full border-none bg-transparent overflow-hidden h-[fit-content]"
+          onBlur={handleBlur}
+          size={"lg"}
+          fontSize={"xl"}
+          fontWeight={"bold"}
+          // className="text-2xl lg:text-4xl font-extrabold text-center mb-4 w-full border-none bg-transparent overflow-hidden h-[fit-content]"
         />
       ) : (
-        <h2
-          className="text-2xl lg:text-4xl font-extrabold text-center mb-4 cursor-pointer"
-          onClick={handleTitleClick}
-        >
-          {displayedTitle}
-        </h2>
+        <>
+          <Heading
+            // className="text-2xl lg:text-4xl font-extrabold text-center mb-4 cursor-pointer"
+            onClick={handleTitleClick}
+            cursor={"pointer"}
+            size={"lg"}
+            noOfLines={1}
+          >
+            {displayedTitle}
+          </Heading>
+          <IconButton
+            icon={<FaPen />}
+            aria-label="Edit Transcript Title"
+            onClick={handleTitleClick}
+            fontSize={"15px"}
+          />
+        </>
       )}
     </>
   );
diff --git a/www/app/[domain]/transcripts/useTranscriptList.ts b/www/app/[domain]/transcripts/useTranscriptList.ts
index 2cfab374..1e55cf7a 100644
--- a/www/app/[domain]/transcripts/useTranscriptList.ts
+++ b/www/app/[domain]/transcripts/useTranscriptList.ts
@@ -20,6 +20,7 @@ const useTranscriptList = (page: number): TranscriptList => {
   const [refetchCount, setRefetchCount] = useState(0);
 
   const refetch = () => {
+    setLoading(true);
     setRefetchCount(refetchCount + 1);
   };
 
diff --git a/www/app/[domain]/transcripts/useWebSockets.ts b/www/app/[domain]/transcripts/useWebSockets.ts
index 585f383c..94b988e9 100644
--- a/www/app/[domain]/transcripts/useWebSockets.ts
+++ b/www/app/[domain]/transcripts/useWebSockets.ts
@@ -6,8 +6,9 @@ import { AudioWaveform, GetTranscriptSegmentTopic } from "../../api";
 import useApi from "../../lib/useApi";
 
 export type UseWebSockets = {
-  transcriptText: string;
+  transcriptTextLive: string;
   translateText: string;
+  accumulatedText: string;
   title: string;
   topics: Topic[];
   finalSummary: FinalSummary;
@@ -17,7 +18,7 @@ export type UseWebSockets = {
 };
 
 export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
-  const [transcriptText, setTranscriptText] = useState<string>("");
+  const [transcriptTextLive, setTranscriptTextLive] = useState<string>("");
   const [translateText, setTranslateText] = useState<string>("");
   const [title, setTitle] = useState<string>("");
   const [textQueue, setTextQueue] = useState<string[]>([]);
@@ -29,12 +30,14 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
   const [finalSummary, setFinalSummary] = useState<FinalSummary>({
     summary: "",
   });
-  const [status, setStatus] = useState<Status>({ value: "initial" });
+  const [status, setStatus] = useState<Status>({ value: "" });
   const { setError } = useError();
 
   const { websocket_url } = useContext(DomainContext);
   const api = useApi();
 
+  const [accumulatedText, setAccumulatedText] = useState<string>("");
+
   useEffect(() => {
     if (isProcessing || textQueue.length === 0) {
       return;
@@ -42,13 +45,12 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
 
     setIsProcessing(true);
     const text = textQueue[0];
-    setTranscriptText(text);
+    setTranscriptTextLive(text);
     setTranslateText(translationQueue[0]);
 
     const WPM_READING = 200 + textQueue.length * 10; // words per minute to read
     const wordCount = text.split(/\s+/).length;
     const delay = (wordCount / WPM_READING) * 60 * 1000;
-    console.log(`displaying "${text}" for ${delay}ms`);
     setTimeout(() => {
       setIsProcessing(false);
       setTextQueue((prevQueue) => prevQueue.slice(1));
@@ -92,7 +94,7 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
           },
         ];
 
-        setTranscriptText("Lorem Ipsum");
+        setTranscriptTextLive("Lorem Ipsum");
         setTopics([
           {
             id: "1",
@@ -190,9 +192,13 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
         setFinalSummary({ summary: "This is the final summary" });
       }
       if (e.key === "z" && process.env.NEXT_PUBLIC_ENV === "development") {
-        setTranscriptText(
+        setTranscriptTextLive(
           "This text is in English, and it is a pretty long sentence to test the limits",
         );
+        setAccumulatedText(
+          "This text is in English, and it is a pretty long sentence to test the limits. This text is in English, and it is a pretty long sentence to test the limits",
+        );
+        setStatus({ value: "recording" });
         setTopics([
           {
             id: "1",
@@ -333,6 +339,8 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
             console.debug("TRANSCRIPT event:", newText);
             setTextQueue((prevQueue) => [...prevQueue, newText]);
             setTranslationQueue((prevQueue) => [...prevQueue, newTranslation]);
+
+            setAccumulatedText((prevText) => prevText + " " + newText);
             break;
 
           case "TOPIC":
@@ -345,6 +353,10 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
                 prevTopics[index] = topic;
                 return prevTopics;
               }
+              setAccumulatedText((prevText) =>
+                prevText.slice(topic.transcript.length),
+              );
+
               return [...prevTopics, topic];
             });
             console.debug("TOPIC event:", message.data);
@@ -419,18 +431,18 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
           break;
         case 1005: // Closure by client FF
           break;
+        case 1001: // Navigate away
+          break;
         default:
           setError(
             new Error(`WebSocket closed unexpectedly with code: ${event.code}`),
-            "Disconnected",
+            "Disconnected from the server. Please refresh the page.",
           );
           console.log(
             "Socket is closed. Reconnect will be attempted in 1 second.",
             event.reason,
           );
-          setTimeout(function () {
-            ws = new WebSocket(url);
-          }, 1000);
+        // todo handle reconnect with socket.io
       }
     };
 
@@ -440,8 +452,9 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
   }, [transcriptId, !api]);
 
   return {
-    transcriptText,
+    transcriptTextLive,
     translateText,
+    accumulatedText,
     topics,
     finalSummary,
     title,
diff --git a/www/app/providers.tsx b/www/app/providers.tsx
index e1c4f283..3f06dd22 100644
--- a/www/app/providers.tsx
+++ b/www/app/providers.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { ChakraProvider } from "@chakra-ui/react";
-import theme from "./theme";
+import theme from "./styles/theme";
 
 export function Providers({ children }: { children: React.ReactNode }) {
   return <ChakraProvider theme={theme}>{children}</ChakraProvider>;
diff --git a/www/app/styles/icons/pause.tsx b/www/app/styles/icons/pause.tsx
new file mode 100644
index 00000000..23d055ed
--- /dev/null
+++ b/www/app/styles/icons/pause.tsx
@@ -0,0 +1,14 @@
+import { Icon } from "@chakra-ui/react";
+
+export default function PauseIcon(props) {
+  return (
+    <Icon viewBox="0 0 30 30" {...props}>
+      <path
+        fill="currentColor"
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M11.514 5.5C11.514 4.11929 10.3947 3 9.01404 3C7.63333 3 6.51404 4.11929 6.51404 5.5V24.5C6.51404 25.8807 7.63333 27 9.01404 27C10.3947 27 11.514 25.8807 11.514 24.5L11.514 5.5ZM23.486 5.5C23.486 4.11929 22.3667 3 20.986 3C19.6053 3 18.486 4.11929 18.486 5.5L18.486 24.5C18.486 25.8807 19.6053 27 20.986 27C22.3667 27 23.486 25.8807 23.486 24.5V5.5Z"
+      />
+    </Icon>
+  );
+}
diff --git a/www/app/styles/icons/play.tsx b/www/app/styles/icons/play.tsx
new file mode 100644
index 00000000..535f7369
--- /dev/null
+++ b/www/app/styles/icons/play.tsx
@@ -0,0 +1,12 @@
+import { Icon } from "@chakra-ui/react";
+
+export default function PlayIcon(props) {
+  return (
+    <Icon viewBox="0 0 30 30" {...props}>
+      <path
+        fill="currentColor"
+        d="M27 13.2679C28.3333 14.0377 28.3333 15.9622 27 16.732L10.5 26.2583C9.16666 27.0281 7.5 26.0659 7.5 24.5263L7.5 5.47372C7.5 3.93412 9.16667 2.97187 10.5 3.74167L27 13.2679Z"
+      />
+    </Icon>
+  );
+}
diff --git a/www/app/styles/icons/stopRecord.tsx b/www/app/styles/icons/stopRecord.tsx
new file mode 100644
index 00000000..146d15a5
--- /dev/null
+++ b/www/app/styles/icons/stopRecord.tsx
@@ -0,0 +1,9 @@
+import { Icon } from "@chakra-ui/react";
+
+export default function StopRecordIcon(props) {
+  return (
+    <Icon viewBox="0 0 20 20" {...props}>
+      <rect width="20" height="20" rx="1" fill="currentColor" />
+    </Icon>
+  );
+}
diff --git a/www/app/styles/recorder.js b/www/app/styles/recorder.js
index b31b9a61..fb4d7883 100644
--- a/www/app/styles/recorder.js
+++ b/www/app/styles/recorder.js
@@ -1,20 +1,26 @@
+import { theme } from "@chakra-ui/react";
+
 export const waveSurferStyles = {
   playerSettings: {
-    waveColor: "#777",
-    progressColor: "#222",
-    cursorColor: "OrangeRed",
+    waveColor: theme.colors.blue[500],
+    progressColor: theme.colors.blue[700],
+    cursorColor: theme.colors.red[500],
+    hideScrollbar: true,
+    autoScroll: false,
+    autoCenter: false,
+    barWidth: 3,
+    barGap: 2,
+    cursorWidth: 2,
   },
   playerStyle: {
     cursor: "pointer",
-    backgroundColor: "RGB(240 240 240)",
-    borderRadius: "15px",
   },
   marker: `
     border-left: solid 1px orange;
     padding: 0 2px 0 5px;
     font-size: 0.7rem;
     border-radius: 0 3px 3px 0;
-
+    top: 0;
     width: 100px;
     max-width: fit-content;
     cursor: pointer;
@@ -25,5 +31,5 @@ export const waveSurferStyles = {
     transition: width 100ms linear;
     z-index: 0;
   `,
-  markerHover: { backgroundColor: "orange" },
+  markerHover: { backgroundColor: theme.colors.gray[200] },
 };
diff --git a/www/app/styles/theme.ts b/www/app/styles/theme.ts
new file mode 100644
index 00000000..f0e42eba
--- /dev/null
+++ b/www/app/styles/theme.ts
@@ -0,0 +1,66 @@
+// 1. Import `extendTheme`
+import { extendTheme } from "@chakra-ui/react";
+
+import { accordionAnatomy } from "@chakra-ui/anatomy";
+import { createMultiStyleConfigHelpers, defineStyle } from "@chakra-ui/react";
+
+const { definePartsStyle, defineMultiStyleConfig } =
+  createMultiStyleConfigHelpers(accordionAnatomy.keys);
+
+const custom = definePartsStyle({
+  container: {
+    border: "0",
+    borderRadius: "8px",
+    backgroundColor: "white",
+    mb: 2,
+    mr: 2,
+  },
+  panel: {
+    pl: 8,
+    pb: 0,
+  },
+  button: {
+    justifyContent: "flex-start",
+    pl: 2,
+  },
+});
+
+const accordionTheme = defineMultiStyleConfig({
+  variants: { custom },
+});
+
+export const colors = {
+  blue: {
+    primary: "#3158E2",
+    500: "#3158E2",
+    light: "#B1CBFF",
+    200: "#B1CBFF",
+    dark: "#0E1B48",
+    900: "#0E1B48",
+  },
+  red: {
+    primary: "#DF7070",
+    500: "#DF7070",
+    light: "#FBD5D5",
+    200: "#FBD5D5",
+  },
+  gray: {
+    bg: "#F4F4F4",
+    100: "#F4F4F4",
+    light: "#D5D5D5",
+    200: "#D5D5D5",
+    primary: "#838383",
+    500: "#838383",
+  },
+  light: "#FFFFFF",
+  dark: "#0C0D0E",
+};
+
+const theme = extendTheme({
+  colors,
+  components: {
+    Accordion: accordionTheme,
+  },
+});
+
+export default theme;
diff --git a/www/app/theme.ts b/www/app/theme.ts
deleted file mode 100644
index e951eef0..00000000
--- a/www/app/theme.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// 1. Import `extendTheme`
-import { extendTheme } from "@chakra-ui/react";
-
-// 2. Call `extendTheme` and pass your custom values
-const theme = extendTheme({
-  colors: {
-    blue: {
-      primary: "#3158E2",
-      500: "#3158E2",
-      light: "#B1CBFF",
-      200: "#B1CBFF",
-      dark: "#0E1B48",
-      900: "#0E1B48",
-    },
-    red: {
-      primary: "#DF7070",
-      500: "#DF7070",
-      light: "#FBD5D5",
-      200: "#FBD5D5",
-    },
-    gray: {
-      bg: "#F4F4F4",
-      100: "#F4F4F4",
-      light: "#D5D5D5",
-      200: "#D5D5D5",
-      primary: "#838383",
-      500: "#838383",
-    },
-    light: "#FFFFFF",
-    dark: "#0C0D0E",
-  },
-});
-
-export default theme;