diff --git a/src/components/monitor-list/monitor-list.css b/src/components/monitor-list/monitor-list.css
index c5fad0b649ea3ce7da2ea0534a728d77e1dfb299..272fb28a66dbed2c3655585faf3b8fb70a56bda7 100644
--- a/src/components/monitor-list/monitor-list.css
+++ b/src/components/monitor-list/monitor-list.css
@@ -1,7 +1,10 @@
 .monitor-list {
-    width: 100%;
-    height: 100%;
+    /* Width/height are set by the component, margin: auto centers in fullscreen */
+    margin: auto;
     pointer-events: none;
+}
+
+.monitor-list-scaler {
     /* Scaling for monitors should happen from the top left */
     transform-origin: left top;
 }
diff --git a/src/components/monitor-list/monitor-list.jsx b/src/components/monitor-list/monitor-list.jsx
index d229b3b291ebd0986bf0a38f5f12f27d97fc2e2e..e9caf7dd691e87a762549b15dbd97b2842690ef1 100644
--- a/src/components/monitor-list/monitor-list.jsx
+++ b/src/components/monitor-list/monitor-list.jsx
@@ -18,29 +18,37 @@ const MonitorList = props => (
         // Use static `monitor-overlay` class for bounds of draggables
         className={classNames(styles.monitorList, 'monitor-overlay')}
         style={{
-            transform: stageSizeToTransform(props.stageSize)
+            width: props.stageSize.width,
+            height: props.stageSize.height
         }}
     >
-        {props.monitors.valueSeq().filter(m => m.visible)
-            .map(monitorData => (
-                <Monitor
-                    height={monitorData.height}
-                    id={monitorData.id}
-                    key={monitorData.id}
-                    max={monitorData.sliderMax}
-                    min={monitorData.sliderMin}
-                    mode={monitorData.mode}
-                    opcode={monitorData.opcode}
-                    params={monitorData.params}
-                    spriteName={monitorData.spriteName}
-                    targetId={monitorData.targetId}
-                    value={monitorData.value}
-                    width={monitorData.width}
-                    x={monitorData.x}
-                    y={monitorData.y}
-                    onDragEnd={props.onMonitorChange}
-                />
-            ))}
+        <Box
+            className={styles.monitorListScaler}
+            style={{
+                transform: stageSizeToTransform(props.stageSize)
+            }}
+        >
+            {props.monitors.valueSeq().filter(m => m.visible)
+                .map(monitorData => (
+                    <Monitor
+                        height={monitorData.height}
+                        id={monitorData.id}
+                        key={monitorData.id}
+                        max={monitorData.sliderMax}
+                        min={monitorData.sliderMin}
+                        mode={monitorData.mode}
+                        opcode={monitorData.opcode}
+                        params={monitorData.params}
+                        spriteName={monitorData.spriteName}
+                        targetId={monitorData.targetId}
+                        value={monitorData.value}
+                        width={monitorData.width}
+                        x={monitorData.x}
+                        y={monitorData.y}
+                        onDragEnd={props.onMonitorChange}
+                    />
+                ))}
+        </Box>
     </Box>
 );
 
diff --git a/src/components/monitor/list-monitor-scroller.jsx b/src/components/monitor/list-monitor-scroller.jsx
index fd6da9babbef90a2d491e51dca96968b67461c62..9fdf38ffdde8d1d9f027a2faa8dec81a4b101d2d 100644
--- a/src/components/monitor/list-monitor-scroller.jsx
+++ b/src/components/monitor/list-monitor-scroller.jsx
@@ -20,7 +20,7 @@ class ListMonitorScroller extends React.Component {
     }
     noRowsRenderer () {
         return (
-            <div className={styles.listEmpty}>
+            <div className={classNames(styles.listRow, styles.listEmpty)}>
                 {'(empty)' /* TODO waiting for design before translation */}
             </div>
         );
diff --git a/src/components/monitor/monitor.css b/src/components/monitor/monitor.css
index 8856799791d074a3a3b524cdd6d33f95aa409dff..40db37cd1c3251a7c44b3b829738a08d84dd3b76 100644
--- a/src/components/monitor/monitor.css
+++ b/src/components/monitor/monitor.css
@@ -138,6 +138,7 @@
 .value-inner {
     padding: 3px 5px;
     min-height: 22px;
+    overflow: hidden; /* Don't let long values escape container */
 }
 
 .list-input {