diff --git a/apps/client/src/features/control/message/InputRow.module.scss b/apps/client/src/features/control/message/InputRow.module.scss
index 769b4eaf2..877549f99 100644
--- a/apps/client/src/features/control/message/InputRow.module.scss
+++ b/apps/client/src/features/control/message/InputRow.module.scss
@@ -1,5 +1,3 @@
-@import "./MessageControl.module.scss";
-
 .inputItems {
   display: grid;
   grid-template-columns: 1fr auto;
@@ -8,5 +6,10 @@
 }
 
 .label {
-  @extend .label;
+  font-size: $inner-section-text-size;
+  color: $label-gray;
+
+  &.active {
+    color: $action-text-color;
+  }
 }
diff --git a/apps/client/src/features/control/message/InputRow.tsx b/apps/client/src/features/control/message/InputRow.tsx
index 76cc2f232..dd947511a 100644
--- a/apps/client/src/features/control/message/InputRow.tsx
+++ b/apps/client/src/features/control/message/InputRow.tsx
@@ -42,7 +42,7 @@ export default function InputRow(props: PropsWithChildren<InputRowProps>) {
   };
 
   return (
-    <div className={style.inputRow}>
+    <div>
       <label className={cx([style.label, visible ?? style.active])} htmlFor={label}>
         {label}
       </label>
diff --git a/apps/client/src/features/control/message/MessageControlExport.module.scss b/apps/client/src/features/control/message/MessageControlExport.module.scss
index 5a31e18ce..7b368a10e 100644
--- a/apps/client/src/features/control/message/MessageControlExport.module.scss
+++ b/apps/client/src/features/control/message/MessageControlExport.module.scss
@@ -1,4 +1,4 @@
-.flexPanel {
+.growPanel {
   flex: 1;
 }
 
diff --git a/apps/client/src/features/control/message/MessageControlExport.tsx b/apps/client/src/features/control/message/MessageControlExport.tsx
index 5816f141d..e49992730 100644
--- a/apps/client/src/features/control/message/MessageControlExport.tsx
+++ b/apps/client/src/features/control/message/MessageControlExport.tsx
@@ -17,7 +17,7 @@ function MessageControlExport() {
 
   return (
     <ProtectRoute permission='editor'>
-      <Editor.Panel className={style.flexPanel} data-testid='panel-messages-control'>
+      <Editor.Panel className={style.growPanel} data-testid='panel-messages-control'>
         {!isExtracted && <Editor.CornerExtract onClick={(event) => handleLinks('messagecontrol', event)} />}
         {isExtracted && <ViewNavigationMenu suppressSettings isNavigationLocked={getIsNavigationLocked()} />}
 
diff --git a/apps/client/src/features/control/message/MessageControl.module.scss b/apps/client/src/features/control/message/TimerPreview.module.scss
similarity index 67%
rename from apps/client/src/features/control/message/MessageControl.module.scss
rename to apps/client/src/features/control/message/TimerPreview.module.scss
index 8efa3b875..0325ee4e7 100644
--- a/apps/client/src/features/control/message/MessageControl.module.scss
+++ b/apps/client/src/features/control/message/TimerPreview.module.scss
@@ -1,18 +1,3 @@
-.label {
-  font-size: $inner-section-text-size;
-  color: $label-gray;
-
-  &.active {
-    color: $action-text-color;
-  }
-}
-
-.previewContainer {
-  display: grid;
-  gap: $element-spacing;
-  grid-template-columns: 3fr 2fr;
-}
-
 .preview {
   background-color: $ui-black;
   display: grid;
@@ -21,21 +6,6 @@
   position: relative;
 }
 
-.options {
-  display: flex;
-  flex-direction: column;
-  gap: $element-spacing;
-}
-
-.eventStatus {
-  position: absolute;
-  left: 0;
-  margin: 0.5rem 0.25rem;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
 .mainContent {
   font-size: 1rem;
   font-weight: 600;
@@ -61,9 +31,13 @@
   display: none;
 }
 
-.timerIndicators {
+.eventStatus {
+  position: absolute;
+  left: 0;
+  margin: 0.5rem 0.25rem;
   display: flex;
   flex-direction: column;
+  gap: 0.25rem;
 }
 
 .statusIcon {
@@ -73,3 +47,4 @@
     color: $active-indicator;
   }
 }
+
diff --git a/apps/client/src/features/control/message/TimerPreview.tsx b/apps/client/src/features/control/message/TimerPreview.tsx
index 11954d885..3d0d0ae92 100644
--- a/apps/client/src/features/control/message/TimerPreview.tsx
+++ b/apps/client/src/features/control/message/TimerPreview.tsx
@@ -10,7 +10,7 @@ import { handleLinks } from '../../../common/utils/linkUtils';
 import { cx, timerPlaceholder } from '../../../common/utils/styleUtils';
 import PipRoot from '../../../views/editor/pip-timer/PipRoot';
 
-import style from './MessageControl.module.scss';
+import style from './TimerPreview.module.scss';
 
 const secondarySourceLabels: Record<string, string> = {
   aux1: 'Aux 1',
diff --git a/apps/client/src/features/control/message/TimerViewControl.module.scss b/apps/client/src/features/control/message/TimerViewControl.module.scss
new file mode 100644
index 000000000..c877a71bb
--- /dev/null
+++ b/apps/client/src/features/control/message/TimerViewControl.module.scss
@@ -0,0 +1,12 @@
+.previewContainer {
+  display: grid;
+  gap: $element-spacing;
+  grid-template-columns: 3fr 2fr;
+}
+
+
+.options {
+  display: flex;
+  flex-direction: column;
+  gap: $element-spacing;
+}
\ No newline at end of file
diff --git a/apps/client/src/features/control/message/TimerViewControl.tsx b/apps/client/src/features/control/message/TimerViewControl.tsx
index cb7d62054..b67500ba4 100644
--- a/apps/client/src/features/control/message/TimerViewControl.tsx
+++ b/apps/client/src/features/control/message/TimerViewControl.tsx
@@ -8,7 +8,7 @@ import { setMessage, useTimerViewControl } from '../../../common/hooks/useSocket
 
 import TimerPreview from './TimerPreview';
 
-import style from './MessageControl.module.scss';
+import style from './TimerViewControl.module.scss';
 
 export default function TimerControlsPreview() {
   const { blackout, blink } = useTimerViewControl();