diff --git a/client/views/room/adapters.js b/client/views/room/adapters.js
index f612f216245..e31729c2ff8 100644
--- a/client/views/room/adapters.js
+++ b/client/views/room/adapters.js
@@ -22,22 +22,22 @@ createTemplateForComponent('room', () => import('.'), {
 	renderContainerView: () => HTML.DIV({ style: 'height: 100%; position: relative;' }), // eslint-disable-line new-cap
 });
 
-createTemplateForComponent('AutoTranslate', () => import('./AutoTranslate'), {
+createTemplateForComponent('AutoTranslate', () => import('./contextualBar/AutoTranslate'), {
 	renderContainerView: () => HTML.DIV({ class: 'contextual-bar' }), // eslint-disable-line new-cap
 });
 
-createTemplateForComponent('NotificationsPreferences', () => import('./NotificationPreferences'), {
+createTemplateForComponent('NotificationsPreferences', () => import('./contextualBar/NotificationPreferences'), {
 	renderContainerView: () => HTML.DIV({ class: 'contextual-bar' }), // eslint-disable-line new-cap
 });
 
-createTemplateForComponent('InviteUsers', () => import('../views/room/RoomMembers/InviteUsers'), {
+createTemplateForComponent('InviteUsers', () => import('./contextualBar/RoomMembers/InviteUsers'), {
 	renderContainerView: () => HTML.DIV({ class: 'contextual-bar' }), // eslint-disable-line new-cap
 });
 
-createTemplateForComponent('EditInvite', () => import('../views/room/RoomMembers/EditInvite'), {
+createTemplateForComponent('EditInvite', () => import('./contextualBar/RoomMembers/EditInvite'), {
 	renderContainerView: () => HTML.DIV({ class: 'contextual-bar' }), // eslint-disable-line new-cap
 });
 
-createTemplateForComponent('OTR', () => import('../views/room/ContextualBar/OTR'), {
+createTemplateForComponent('OTR', () => import('./contextualBar/OTR'), {
 	renderContainerView: () => HTML.DIV({ class: 'contextual-bar' }), // eslint-disable-line new-cap
 });
diff --git a/client/views/room/ContextualBar/AutoTranslate/AutoTranslate.js b/client/views/room/contextualBar/AutoTranslate/AutoTranslate.js
similarity index 100%
rename from client/views/room/ContextualBar/AutoTranslate/AutoTranslate.js
rename to client/views/room/contextualBar/AutoTranslate/AutoTranslate.js
diff --git a/client/views/room/ContextualBar/AutoTranslate/AutoTranslate.stories.js b/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.js
similarity index 100%
rename from client/views/room/ContextualBar/AutoTranslate/AutoTranslate.stories.js
rename to client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.js
diff --git a/client/views/room/ContextualBar/AutoTranslate/index.js b/client/views/room/contextualBar/AutoTranslate/index.js
similarity index 100%
rename from client/views/room/ContextualBar/AutoTranslate/index.js
rename to client/views/room/contextualBar/AutoTranslate/index.js
diff --git a/client/views/room/NotificationPreferences/NotificationPreferences.js b/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.js
similarity index 92%
rename from client/views/room/NotificationPreferences/NotificationPreferences.js
rename to client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.js
index 7947b118174..acb7eeec716 100644
--- a/client/views/room/NotificationPreferences/NotificationPreferences.js
+++ b/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.js
@@ -2,12 +2,12 @@ import React from 'react';
 import { Button, ButtonGroup, FieldGroup, Icon } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 
-import { useForm } from '../../../hooks/useForm';
-import { useUserSubscription, useUser } from '../../../contexts/UserContext';
-import { useTranslation } from '../../../contexts/TranslationContext';
-import { useCustomSound } from '../../../contexts/CustomSoundContext';
-import { useEndpointActionExperimental } from '../../../hooks/useEndpointAction';
-import VerticalBar from '../../../components/VerticalBar';
+import { useForm } from '../../../../hooks/useForm';
+import { useUserSubscription, useUser } from '../../../../contexts/UserContext';
+import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useCustomSound } from '../../../../contexts/CustomSoundContext';
+import { useEndpointActionExperimental } from '../../../../hooks/useEndpointAction';
+import VerticalBar from '../../../../components/VerticalBar';
 import { Preferences } from './components/Preferences';
 import { NotificationByDevice } from './components/NotificationByDevice';
 import { NotificationToogle } from './components/NotificationToogle';
diff --git a/client/views/room/NotificationPreferences/NotificationsPreferences.stories.js b/client/views/room/contextualBar/NotificationPreferences/NotificationsPreferences.stories.js
similarity index 95%
rename from client/views/room/NotificationPreferences/NotificationsPreferences.stories.js
rename to client/views/room/contextualBar/NotificationPreferences/NotificationsPreferences.stories.js
index 860b806de1c..04896896271 100644
--- a/client/views/room/NotificationPreferences/NotificationsPreferences.stories.js
+++ b/client/views/room/contextualBar/NotificationPreferences/NotificationsPreferences.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box } from '@rocket.chat/fuselage';
 
-import VerticalBar from '../../../components/VerticalBar';
+import VerticalBar from '../../../../components/VerticalBar';
 
 import { NotificationsPreferences } from '.';
 
diff --git a/client/views/room/NotificationPreferences/components/NotificationByDevice.js b/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js
similarity index 100%
rename from client/views/room/NotificationPreferences/components/NotificationByDevice.js
rename to client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js
diff --git a/client/views/room/NotificationPreferences/components/NotificationToogle.js b/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.js
similarity index 92%
rename from client/views/room/NotificationPreferences/components/NotificationToogle.js
rename to client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.js
index 1e50a2ad97b..d58bd43dd60 100644
--- a/client/views/room/NotificationPreferences/components/NotificationToogle.js
+++ b/client/views/room/contextualBar/NotificationPreferences/components/NotificationToogle.js
@@ -8,7 +8,7 @@ export const NotificationToogle = React.memo(({ label, description, onChange, de
 	return <FieldGroup>
 		<Box display='flex' justifyContent='space-between' alignItems='start'>
 			<Box display='flex' flexDirection='column'>
-				<Field.Label for={id}>{label}</Field.Label>
+				<Field.Label htmlFor={id}>{label}</Field.Label>
 				<Field.Description>{description}</Field.Description>
 			</Box>
 			<ToggleSwitch id={id} onChange={onChange} defaultChecked={defaultChecked} />
diff --git a/client/views/room/NotificationPreferences/components/Preferences.js b/client/views/room/contextualBar/NotificationPreferences/components/Preferences.js
similarity index 100%
rename from client/views/room/NotificationPreferences/components/Preferences.js
rename to client/views/room/contextualBar/NotificationPreferences/components/Preferences.js
diff --git a/client/views/room/NotificationPreferences/index.js b/client/views/room/contextualBar/NotificationPreferences/index.js
similarity index 100%
rename from client/views/room/NotificationPreferences/index.js
rename to client/views/room/contextualBar/NotificationPreferences/index.js
diff --git a/client/views/room/ContextualBar/OTR/OTR.js b/client/views/room/contextualBar/OTR/OTR.js
similarity index 100%
rename from client/views/room/ContextualBar/OTR/OTR.js
rename to client/views/room/contextualBar/OTR/OTR.js
diff --git a/client/views/room/ContextualBar/OTR/OTR.stories.js b/client/views/room/contextualBar/OTR/OTR.stories.js
similarity index 100%
rename from client/views/room/ContextualBar/OTR/OTR.stories.js
rename to client/views/room/contextualBar/OTR/OTR.stories.js
diff --git a/client/views/room/ContextualBar/OTR/OTRModal.js b/client/views/room/contextualBar/OTR/OTRModal.js
similarity index 100%
rename from client/views/room/ContextualBar/OTR/OTRModal.js
rename to client/views/room/contextualBar/OTR/OTRModal.js
diff --git a/client/views/room/ContextualBar/OTR/index.js b/client/views/room/contextualBar/OTR/index.js
similarity index 100%
rename from client/views/room/ContextualBar/OTR/index.js
rename to client/views/room/contextualBar/OTR/index.js
diff --git a/client/views/room/RoomMembers/EditInvite/EditInvite.js b/client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.js
similarity index 93%
rename from client/views/room/RoomMembers/EditInvite/EditInvite.js
rename to client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.js
index c31f266578e..3b9fe42e6d8 100644
--- a/client/views/room/RoomMembers/EditInvite/EditInvite.js
+++ b/client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.js
@@ -2,8 +2,8 @@ import React, { useMemo, useState } from 'react';
 import { Box, Field, Select, Button, InputBox } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 
-import { useTranslation } from '../../../../contexts/TranslationContext';
-import VerticalBar from '../../../../components/VerticalBar';
+import { useTranslation } from '../../../../../contexts/TranslationContext';
+import VerticalBar from '../../../../../components/VerticalBar';
 
 export const EditInvite = ({
 	onClickBack,
diff --git a/client/views/room/RoomMembers/EditInvite/EditInvite.stories.js b/client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.stories.js
similarity index 85%
rename from client/views/room/RoomMembers/EditInvite/EditInvite.stories.js
rename to client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.stories.js
index 19dee329065..9aff3488421 100644
--- a/client/views/room/RoomMembers/EditInvite/EditInvite.stories.js
+++ b/client/views/room/contextualBar/RoomMembers/EditInvite/EditInvite.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { EditInvite } from './EditInvite';
-import VerticalBar from '../../../../components/VerticalBar';
+import VerticalBar from '../../../../../components/VerticalBar';
 
 export default {
 	title: 'components/RoomMembers/EditInvite',
diff --git a/client/views/room/RoomMembers/EditInvite/index.js b/client/views/room/contextualBar/RoomMembers/EditInvite/index.js
similarity index 100%
rename from client/views/room/RoomMembers/EditInvite/index.js
rename to client/views/room/contextualBar/RoomMembers/EditInvite/index.js
diff --git a/client/views/room/RoomMembers/InviteUsers/InviteUsers.js b/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.js
similarity index 90%
rename from client/views/room/RoomMembers/InviteUsers/InviteUsers.js
rename to client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.js
index 2789a8930e4..46a68d7ce80 100644
--- a/client/views/room/RoomMembers/InviteUsers/InviteUsers.js
+++ b/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.js
@@ -2,11 +2,11 @@ import React, { useState, useEffect } from 'react';
 import { Box, Field, UrlInput, Icon, Button, InputBox, Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 
-import useClipboard from '../../../../hooks/useClipboard';
-import VerticalBar from '../../../../components/VerticalBar';
-import { useTranslation } from '../../../../contexts/TranslationContext';
-import { useEndpoint } from '../../../../contexts/ServerContext';
-import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
+import useClipboard from '../../../../../hooks/useClipboard';
+import VerticalBar from '../../../../../components/VerticalBar';
+import { useTranslation } from '../../../../../contexts/TranslationContext';
+import { useEndpoint } from '../../../../../contexts/ServerContext';
+import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import EditInvite from '../EditInvite';
 
 export const InviteUsers = ({
diff --git a/client/views/room/RoomMembers/InviteUsers/InviteUsers.stories.js b/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.js
similarity index 87%
rename from client/views/room/RoomMembers/InviteUsers/InviteUsers.stories.js
rename to client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.js
index 824dc6909c1..a76e04a00e5 100644
--- a/client/views/room/RoomMembers/InviteUsers/InviteUsers.stories.js
+++ b/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { InviteUsers } from './InviteUsers';
-import VerticalBar from '../../../../components/VerticalBar';
+import VerticalBar from '../../../../../components/VerticalBar';
 
 export default {
 	title: 'components/RoomMembers/InviteUsers',
diff --git a/client/views/room/RoomMembers/InviteUsers/index.js b/client/views/room/contextualBar/RoomMembers/InviteUsers/index.js
similarity index 100%
rename from client/views/room/RoomMembers/InviteUsers/index.js
rename to client/views/room/contextualBar/RoomMembers/InviteUsers/index.js