diff --git a/web/components/common/ContentHeader/ContentHeader.module.scss b/web/components/common/ContentHeader/ContentHeader.module.scss
index 0d18a9f27..60416dbde 100644
--- a/web/components/common/ContentHeader/ContentHeader.module.scss
+++ b/web/components/common/ContentHeader/ContentHeader.module.scss
@@ -20,6 +20,7 @@
       margin-left: auto;
       margin-right: auto;
       margin-bottom: 10px;
+      margin-top: 10px;
     }
   }
 }
diff --git a/web/components/stores/application-state.ts b/web/components/stores/application-state.ts
index 329325039..7a4c10b1f 100644
--- a/web/components/stores/application-state.ts
+++ b/web/components/stores/application-state.ts
@@ -70,6 +70,7 @@ const appStateModel =
   createMachine({
     id: 'appState',
     initial: 'loading',
+    predictableActionArguments: true,
     states: {
       loading: {
         meta: {
diff --git a/web/components/ui/Content/Content.tsx b/web/components/ui/Content/Content.tsx
index e436a3e7e..6704c317b 100644
--- a/web/components/ui/Content/Content.tsx
+++ b/web/components/ui/Content/Content.tsx
@@ -7,9 +7,9 @@ import { LOCAL_STORAGE_KEYS, getLocalStorage, setLocalStorage } from '../../../u
 
 import {
   clientConfigStateAtom,
-  chatMessagesAtom,
-  chatDisplayNameAtom,
-  chatUserIdAtom,
+  // chatMessagesAtom,
+  // chatDisplayNameAtom,
+  // chatUserIdAtom,
   isChatVisibleSelector,
   appStateAtom,
   isOnlineSelector,
@@ -23,8 +23,8 @@ import FollowerCollection from '../Followers/FollowersCollection';
 import s from './Content.module.scss';
 import Sidebar from '../Sidebar';
 import Footer from '../Footer';
-import ChatContainer from '../../chat/ChatContainer';
-import { ChatMessage } from '../../../interfaces/chat-message.model';
+// import ChatContainer from '../../chat/ChatContainer';
+// import { ChatMessage } from '../../../interfaces/chat-message.model';
 // import ChatTextField from '../../chat/ChatTextField/ChatTextField';
 import ActionButtonRow from '../../action-buttons/ActionButtonRow';
 import ActionButton from '../../action-buttons/ActionButton';
@@ -47,10 +47,10 @@ export default function ContentComponent() {
   const clientConfig = useRecoilValue<ClientConfig>(clientConfigStateAtom);
   const isChatVisible = useRecoilValue<boolean>(isChatVisibleSelector);
   const [isMobile, setIsMobile] = useRecoilState<boolean | undefined>(isMobileAtom);
-  const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom);
+  // const messages = useRecoilValue<ChatMessage[]>(chatMessagesAtom);
   const online = useRecoilValue<boolean>(isOnlineSelector);
-  const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom);
-  const chatUserId = useRecoilValue<string>(chatUserIdAtom);
+  // const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom);
+  // const chatUserId = useRecoilValue<string>(chatUserIdAtom);
   const { viewerCount, lastConnectTime, lastDisconnectTime, streamTitle } =
     useRecoilValue<ServerStatus>(serverStatusState);
   const {
@@ -151,6 +151,8 @@ export default function ContentComponent() {
               <BrowserNotifyModal />
             </Modal>
           </div>
+        </div>
+        <div className={s.lowerHalf}>
           <ContentHeader
             name={name}
             title={streamTitle}
@@ -159,12 +161,10 @@ export default function ContentComponent() {
             links={socialHandles}
             logo="/logo"
           />
-        </div>
-        <div className={s.lowerHalf}>
           <Tabs defaultActiveKey="0" style={{ height: '100%' }}>
             {isChatVisible && isMobile && (
               <TabPane tab="Chat" key="0" style={{ height: '100%' }}>
-                <div style={{ position: 'relative', height: '100%' }}>
+                {/* <div style={{ position: 'relative', height: '100%' }}>
                   <div className={s.mobileChat}>
                     <ChatContainer
                       messages={messages}
@@ -174,7 +174,7 @@ export default function ContentComponent() {
                       isModerator={false}
                     />
                   </div>
-                </div>
+                </div> */}
               </TabPane>
             )}
             <TabPane tab="About" key="2" className={s.pageContentSection}>