diff --git a/client/src/common/components/buttons/UnloadIconBtn.jsx b/client/src/common/components/buttons/UnloadIconBtn.jsx
index 631f4b9e8..e27d5a29d 100644
--- a/client/src/common/components/buttons/UnloadIconBtn.jsx
+++ b/client/src/common/components/buttons/UnloadIconBtn.jsx
@@ -1,11 +1,11 @@
 import { IconButton } from '@chakra-ui/button';
-import { FiCornerLeftUp } from 'react-icons/fi';
+import { FiXOctagon } from 'react-icons/fi';
 
 export default function UnloadIconBtn(props) {
   const { clickhandler, ...rest } = props;
   return (
     <IconButton
-      icon={<FiCornerLeftUp />}
+      icon={<FiXOctagon />}
       colorScheme='whiteAlpha'
       backgroundColor='#ffffff05'
       variant='outline'
diff --git a/client/src/features/control/PlaybackButtons.jsx b/client/src/features/control/PlaybackButtons.jsx
index 8958bba51..5e74204d8 100644
--- a/client/src/features/control/PlaybackButtons.jsx
+++ b/client/src/features/control/PlaybackButtons.jsx
@@ -41,11 +41,11 @@ const Transport = ({ selectedId, playbackControl }) => {
     <div className={style.playbackContainer}>
       <PrevIconBtn clickhandler={() => playbackControl('previous')} />
       <NextIconBtn clickhandler={() => playbackControl('next')} />
-      <UnloadIconBtn clickhandler={() => playbackControl('unload')} />
       <ReloadIconButton
         clickhandler={() => playbackControl('reload')}
         disabled={!selectedId}
       />
+      <UnloadIconBtn clickhandler={() => playbackControl('unload')} />
     </div>
   );
 };
diff --git a/client/src/features/editors/list/ActionButtons.jsx b/client/src/features/editors/list/ActionButtons.jsx
index f571be840..6035a00ec 100644
--- a/client/src/features/editors/list/ActionButtons.jsx
+++ b/client/src/features/editors/list/ActionButtons.jsx
@@ -28,7 +28,7 @@ export default function ActionButtons(props) {
           onClick={() => actionHandler('event')}
           isDisabled={!showAdd}
         >
-          Event next
+          Add Event after
         </MenuItem>
 
         <MenuItem
@@ -36,14 +36,14 @@ export default function ActionButtons(props) {
           onClick={() => actionHandler('delay')}
           isDisabled={!showDelay}
         >
-          Delay next
+          Add Delay after
         </MenuItem>
         <MenuItem
           icon={<FiMinusCircle />}
           onClick={() => actionHandler('block')}
           isDisabled={!showBlock}
         >
-          Block next
+          Add Block after
         </MenuItem>
       </MenuList>
     </Menu>
diff --git a/client/src/features/menu/MenuActionButtons.jsx b/client/src/features/menu/MenuActionButtons.jsx
index 5df8ecb95..25a34304f 100644
--- a/client/src/features/menu/MenuActionButtons.jsx
+++ b/client/src/features/menu/MenuActionButtons.jsx
@@ -24,16 +24,16 @@ export default function MenuActionButtons(props) {
       />
       <MenuList style={menuStyle}>
         <MenuItem icon={<FiPlus />} onClick={() => actionHandler('event')}>
-          Event first
+          Add Event first
         </MenuItem>
         <MenuItem icon={<FiClock />} onClick={() => actionHandler('delay')}>
-          Delay first
+          Add Delay first
         </MenuItem>
         <MenuItem
           icon={<FiMinusCircle />}
           onClick={() => actionHandler('block')}
         >
-          Block first
+          Add Block first
         </MenuItem>
         <Divider />
         <MenuItem
diff --git a/client/src/features/viewers/backstage/StageManager.jsx b/client/src/features/viewers/backstage/StageManager.jsx
index 6ee5cadc8..e347f4271 100644
--- a/client/src/features/viewers/backstage/StageManager.jsx
+++ b/client/src/features/viewers/backstage/StageManager.jsx
@@ -142,7 +142,7 @@ export default function StageManager(props) {
         <div className={style.qr}>
           {general.url != null && general.url !== '' && (
             <QRCode
-              value='www.carlosvalente.com'
+              value={general.url}
               size={window.innerWidth / 12}
               level='L'
             />
diff --git a/client/src/features/viewers/foh/Public.jsx b/client/src/features/viewers/foh/Public.jsx
index f0ee2fb82..126e67918 100644
--- a/client/src/features/viewers/foh/Public.jsx
+++ b/client/src/features/viewers/foh/Public.jsx
@@ -109,7 +109,7 @@ export default function Public(props) {
         <div className={style.qr}>
           {general.url != null && general.url !== '' && (
             <QRCode
-              value='www.carlosvalente.com'
+              value={general.url}
               size={window.innerWidth / 12}
               level='L'
             />
diff --git a/client/src/features/viewers/production/Pip.jsx b/client/src/features/viewers/production/Pip.jsx
index b793d6e2b..b0b5492f8 100644
--- a/client/src/features/viewers/production/Pip.jsx
+++ b/client/src/features/viewers/production/Pip.jsx
@@ -87,7 +87,7 @@ export default function Pip(props) {
             <div className={style.qr}>
               {general.url != null && general.url !== '' && (
                 <QRCode
-                  value='www.carlosvalente.com'
+                  value={general.url}
                   size={window.innerWidth / 12}
                   level='L'
                 />