diff --git a/ui/component/fileActions/view.jsx b/ui/component/fileActions/view.jsx
index 91e07ccda..4d045f71c 100644
--- a/ui/component/fileActions/view.jsx
+++ b/ui/component/fileActions/view.jsx
@@ -3,6 +3,7 @@ import { SIMPLE_SITE, SITE_NAME, ENABLE_FILE_REACTIONS } from 'config';
 import * as PAGES from 'constants/pages';
 import * as MODALS from 'constants/modal_types';
 import * as ICONS from 'constants/icons';
+import * as PUBLISH_MODES from 'constants/publish_types';
 import React from 'react';
 import Button from 'component/button';
 import FileDownloadLink from 'component/fileDownloadLink';
@@ -114,7 +115,7 @@ function FileActions(props: Props) {
           className="button--file-action"
           icon={ICONS.EDIT}
           label={__('Edit')}
-          navigate={`/$/upload${isLivestreamClaim ? '?type=livestream' : ''}`}
+          navigate={`/$/${PAGES.UPLOAD}${isLivestreamClaim ? `?ytype=${PUBLISH_MODES.LIVESTREAM}` : ''}`}
           onClick={() => {
             prepareEdit(claim, editUri, fileInfo);
           }}
@@ -125,7 +126,7 @@ function FileActions(props: Props) {
           className="button--file-action"
           icon={ICONS.PUBLISH}
           label={__('Publish Replay')}
-          navigate="/$/upload?type=file"
+          navigate={`/$/${PAGES.UPLOAD}?ytype=${PUBLISH_MODES.FILE}`}
           onClick={() => {
             prepareEdit(claim, editUri, fileInfo);
           }}
diff --git a/ui/page/livestreamSetup/view.jsx b/ui/page/livestreamSetup/view.jsx
index f15592e5e..6783fbb1b 100644
--- a/ui/page/livestreamSetup/view.jsx
+++ b/ui/page/livestreamSetup/view.jsx
@@ -55,11 +55,13 @@ export default function LivestreamSetupPage(props: Props) {
         <li>{__(`Tune: Zerolatency`)}</li>
       </ul>
       <p>
-        {__(`If using other livestreaming software, make sure the bitrate is below 5Mbps or the stream will not work.`)}
+        {__(
+          `If using other livestreaming software, make sure the bitrate is below 5000 kbps or the stream will not work.`
+        )}
       </p>
       <p>
         {__(
-          `Please note: You'll need to record your own stream through your software if you plan to share it afterward. You can also delete it if you prefer not to upload the copy. In the near future, we'll support a more streamlined process that will let you upload the replay.`
+          `Please note: You'll need to record your own stream through your software if you plan to share it afterward. You can also delete it if you prefer not to upload the copy.`
         )}
       </p>
       <p>
@@ -69,9 +71,9 @@ export default function LivestreamSetupPage(props: Props) {
       </p>
       <p>
         {__(`After your livestream:
-      Click the Upload Stream button. This will allow you to edit details before sharing on Odysee. Be sure to select the saved mp4 file you recorded.`)}
+      Click the Publish Replay button. This will allow you to edit details before sharing on Odysee. Be sure to select the saved mp4 file you recorded.`)}
       </p>
-      <p>{__(`Click *save* and you are done!`)}</p>
+      <p>{__(`Click Save and you are done!`)}</p>
     </div>
   );
   React.useEffect(() => {
diff --git a/ui/redux/actions/publish.js b/ui/redux/actions/publish.js
index aa9b6715c..8395bcfff 100644
--- a/ui/redux/actions/publish.js
+++ b/ui/redux/actions/publish.js
@@ -93,7 +93,7 @@ export const doPublishDesktop = (filePath: string, preview?: boolean) => (dispat
   // on the publishes page. This doesn't exist on desktop so wait until we get a response
   // from the SDK
   // @if TARGET='web'
-  dispatch(push(noFile ? `/$/${PAGES.UPLOADS}` : `/$/${PAGES.LIVESTREAM}`));
+  dispatch(push(noFile ? `/$/${PAGES.LIVESTREAM}` : `/$/${PAGES.UPLOADS}`));
   // @endif
 
   dispatch(doPublish(publishSuccess, publishFail));