diff --git a/app/src/Chat.js b/app/src/Chat.js
index ca513cf..9225d79 100644
--- a/app/src/Chat.js
+++ b/app/src/Chat.js
@@ -71,7 +71,6 @@ import Create from './Create';
 import { goTo } from 'route-lite';
 import CallManager from './CallManager';
 import VideoListener from './VideoListener';
-import VoxeetSDK from '@voxeet/voxeet-web-sdk';
 
 const giphyFetch = new GiphyFetch('ojJbIMUN6XRMn4mHiFFav3rMCpXUg8sq');
 const alerts = [
@@ -354,6 +353,7 @@ export default class Chat extends Component {
                 rowsMax={2}
                 variant="outlined"
                 fullWidth
+                color="secondary"
                 InputProps={{
                   endAdornment: (
                     <Tooltip title="Share party" aria-label="Share party">
@@ -409,17 +409,22 @@ export default class Chat extends Component {
                   <Chip className="party-controls-users-chip" clickable size="small" label={user} />
                 ))}
               </div>
-              {VoxeetSDK.conference.participants.size > 0 ? (
+              {Object.keys(usersOnCall).length > 0 ? (
                 <Typography className="party-controls-users-title" variant="overline">
                   MEMBERS IN CALL
                 </Typography>
               ) : null}
-              {VoxeetSDK.conference.participants.size > 0 ? (
+              {Object.keys(usersOnCall).length > 0 ? (
                 <div className="party-controls-users-container">
                   {Object.keys(usersOnCall).map((id) => {
                     return usersOnCall[id].status === 'Connected' ||
                       usersOnCall[id].status === 'Connecting' ? (
                       <Chip
+                        color={
+                          usersOnCall[id].info.externalId === LocalData().userUid
+                            ? 'secondary'
+                            : null
+                        }
                         className="party-controls-users-chip"
                         clickable
                         size="small"
diff --git a/functions/modules/scheduledCleanUp.js b/functions/modules/scheduledCleanUp.js
index 8bb3a03..2fc91a5 100644
--- a/functions/modules/scheduledCleanUp.js
+++ b/functions/modules/scheduledCleanUp.js
@@ -27,7 +27,10 @@ module.exports = async () => {
       .get()
       .then(async (roomSnap) => {
         if (
-          timeDiff(roomSnap.createTime.toDate(), startedTime) >= 24 ||
+          // MORE THAN 24 HOURS AND NOT IN USE
+          (timeDiff(roomSnap.createTime.toDate(), startedTime) >= 24 &&
+            timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12) ||
+          // LESS THAN 24 HOURS BUT NOT IN USE
           timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12
         ) {
           await cleanUpRoom(roomSnap.id);
diff --git a/website/copyright/index.html b/website/copyright/index.html
index e5ef7e6..be29525 100644
--- a/website/copyright/index.html
+++ b/website/copyright/index.html
@@ -37,7 +37,7 @@ HBO Now and HBO Max logos are trademark and intellectual property of WarnerMedia
     <link rel="stylesheet" type="text/css" href="../font.css" />
     <link rel="stylesheet" type="text/css" href="../styles/index.css" />
     <script src="../scripts/Stickied.js"></script>
-    <title>Watch Party</title>
+    <title>Watch Party | Copyright</title>
   </head>
   <body class="copyright">
     <div class="landing">
diff --git a/website/welcome/index.html b/website/welcome/index.html
index 411f6cb..f48f5c2 100644
--- a/website/welcome/index.html
+++ b/website/welcome/index.html
@@ -37,7 +37,7 @@ HBO Now and HBO Max logos are trademark and intellectual property of WarnerMedia
     <link rel="stylesheet" type="text/css" href="../font.css" />
     <link rel="stylesheet" type="text/css" href="../styles/index.css" />
     <script src="../scripts/Stickied.js"></script>
-    <title>Watch Party</title>
+    <title>Watch Party | Welcome</title>
   </head>
   <body class="welcome">
     <div class="landing">