diff --git a/app/ui-sidenav/client/sideNav.html b/app/ui-sidenav/client/sideNav.html
index d4226524337..c8841b2df1c 100644
--- a/app/ui-sidenav/client/sideNav.html
+++ b/app/ui-sidenav/client/sideNav.html
@@ -7,9 +7,7 @@
 			</div>
 		</div>
 		<div class="rooms-list sidebar--custom-colors" aria-label="{{_ "Channels"}}" role="region">
-			<div style="display: flex; flex: 1 1 auto;">
-				{{> sidebarChats }}
-			</div>
+			{{> sidebarChats }}
 		</div>
 		<div class="wrapper-unread">
 			<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden">
diff --git a/client/templates.ts b/client/templates.ts
index 52f2752000c..5b78d24c3ee 100644
--- a/client/templates.ts
+++ b/client/templates.ts
@@ -57,7 +57,10 @@ createTemplateForComponent('messageLocation', () => import('./views/location/Mes
 createTemplateForComponent('sidebarHeader', () => import('./sidebar/header'));
 
 createTemplateForComponent('sidebarChats', () => import('./sidebar/RoomList/index'), {
-	attachment: 'at-parent',
+	renderContainerView: () =>
+		HTML.DIV({
+			style: 'display: flex; flex: 1 1 100%;',
+		}),
 });
 
 createTemplateForComponent(
diff --git a/ee/app/ecdh/ClientSession.ts b/ee/app/ecdh/client/ClientSession.ts
similarity index 94%
rename from ee/app/ecdh/ClientSession.ts
rename to ee/app/ecdh/client/ClientSession.ts
index 8ac51d96227..6e87cbae6b1 100644
--- a/ee/app/ecdh/ClientSession.ts
+++ b/ee/app/ecdh/client/ClientSession.ts
@@ -1,4 +1,4 @@
-import { Session } from './Session';
+import { Session } from '../Session';
 
 export class ClientSession extends Session {
 	async init(): Promise<string> {
diff --git a/ee/app/ecdh/ServerSession.ts b/ee/app/ecdh/server/ServerSession.ts
similarity index 95%
rename from ee/app/ecdh/ServerSession.ts
rename to ee/app/ecdh/server/ServerSession.ts
index 50f7af43052..643f58a00b8 100644
--- a/ee/app/ecdh/ServerSession.ts
+++ b/ee/app/ecdh/server/ServerSession.ts
@@ -1,4 +1,4 @@
-import { Session } from './Session';
+import { Session } from '../Session';
 
 export type ProcessString = (text: string[]) => string;
 export type ProcessBuffer = (text: Buffer) => Buffer[];
diff --git a/ee/client/ecdh.ts b/ee/client/ecdh.ts
index 46654b941ee..039a938aab9 100644
--- a/ee/client/ecdh.ts
+++ b/ee/client/ecdh.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { APIClient } from '../../app/utils/client';
-import { ClientSession } from '../app/ecdh/ClientSession';
+import { ClientSession } from '../app/ecdh/client/ClientSession';
 
 let resolveSession: (value: ClientSession | void) => void;
 const sessionPromise = new Promise<ClientSession | void>((resolve) => {
diff --git a/ee/server/services/ecdh-proxy/lib/server.ts b/ee/server/services/ecdh-proxy/lib/server.ts
index 07ca0eb040f..cee61da95ed 100644
--- a/ee/server/services/ecdh-proxy/lib/server.ts
+++ b/ee/server/services/ecdh-proxy/lib/server.ts
@@ -8,7 +8,7 @@ import express, { Request, Response } from 'express';
 import cookieParser from 'cookie-parser';
 import mem from 'mem';
 
-import { ServerSession } from '../../../../app/ecdh/ServerSession';
+import { ServerSession } from '../../../../app/ecdh/server/ServerSession';
 
 const app = express();
 app.use(cookieParser());
diff --git a/imports/client/poly1305-js b/imports/client/poly1305-js
new file mode 120000
index 00000000000..b7d35ec5ea8
--- /dev/null
+++ b/imports/client/poly1305-js
@@ -0,0 +1 @@
+../../node_modules/poly1305-js
\ No newline at end of file
diff --git a/imports/client/sodium-native b/imports/client/sodium-native
new file mode 120000
index 00000000000..31ec3807c53
--- /dev/null
+++ b/imports/client/sodium-native
@@ -0,0 +1 @@
+../../node_modules/sodium-native
\ No newline at end of file
diff --git a/packages/react-fast-refresh/client-runtime.js b/packages/react-fast-refresh/client-runtime.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/react-fast-refresh/package.js b/packages/react-fast-refresh/package.js
new file mode 100644
index 00000000000..d44a6867d2d
--- /dev/null
+++ b/packages/react-fast-refresh/package.js
@@ -0,0 +1,15 @@
+Package.describe({
+	name: 'react-fast-refresh',
+	version: '0.1.0',
+	summary: 'Removed -update React components with HMR',
+	documentation: 'README.md',
+	devOnly: true,
+});
+
+Package.onUse(function(api) {
+	api.export('ReactFastRefresh');
+	api.use('modules');
+	api.addFiles('server.js', 'server');
+	api.addFiles('client-runtime.js', 'web.browser');
+	api.use('hot-module-replacement', { weak: true });
+});
diff --git a/packages/react-fast-refresh/server.js b/packages/react-fast-refresh/server.js
new file mode 100644
index 00000000000..e69de29bb2d