diff --git a/app/lib/components/Peer.jsx b/app/lib/components/Peer.jsx
index a49a688..fc11ce3 100644
--- a/app/lib/components/Peer.jsx
+++ b/app/lib/components/Peer.jsx
@@ -38,10 +38,6 @@ class Peer extends Component
 			screenConsumer,
 			onMuteMic,
 			onUnmuteMic,
-			onDisableWebcam,
-			onEnableWebcam,
-			onDisableScreen,
-			onEnableScreen,
 			toggleConsumerFullscreen,
 			style
 		} = this.props;
@@ -90,6 +86,13 @@ class Peer extends Component
 					:null
 				}
 
+				{!videoVisible ?
+					<div className='paused-video'>
+						<p>this video is paused</p>
+					</div>
+					:null
+				}
+
 				<div className={classnames('view-container', 'webcam')} style={style}>
 					<div className='indicators'>
 						{peer.raiseHandState ?
@@ -123,20 +126,6 @@ class Peer extends Component
 							}}
 						/>
 
-						<div
-							className={classnames('button', 'webcam', {
-								on       : videoVisible,
-								off      : !videoVisible,
-								disabled : peer.peerVideoInProgress
-							})}
-							onClick={(e) =>
-							{
-								e.stopPropagation();
-								videoVisible ?
-									onDisableWebcam(peer.name) : onEnableWebcam(peer.name);
-							}}
-						/>
-
 						<div
 							className={classnames('button', 'fullscreen')}
 							onClick={(e) =>
@@ -146,6 +135,7 @@ class Peer extends Component
 							}}
 						/>
 					</div>
+
 					<PeerView
 						advancedMode={advancedMode}
 						peer={peer}
@@ -165,20 +155,6 @@ class Peer extends Component
 								visible : this.state.controlsVisible
 							})}
 						>
-							<div
-								className={classnames('button', 'screen', {
-									on       : screenVisible,
-									off      : !screenVisible,
-									disabled : peer.peerScreenInProgress
-								})}
-								onClick={(e) =>
-								{
-									e.stopPropagation();
-									screenVisible ?
-										onDisableScreen(peer.name) : onEnableScreen(peer.name);
-								}}
-							/>
-
 							<div
 								className={classnames('button', 'fullscreen')}
 								onClick={(e) =>
@@ -212,12 +188,8 @@ Peer.propTypes =
 	screenConsumer           : appPropTypes.Consumer,
 	onMuteMic                : PropTypes.func.isRequired,
 	onUnmuteMic              : PropTypes.func.isRequired,
-	onEnableWebcam           : PropTypes.func.isRequired,
-	onDisableWebcam          : PropTypes.func.isRequired,
 	streamDimensions         : PropTypes.object,
 	style                    : PropTypes.object,
-	onEnableScreen           : PropTypes.func.isRequired,
-	onDisableScreen          : PropTypes.func.isRequired,
 	toggleConsumerFullscreen : PropTypes.func.isRequired
 };
 
@@ -252,23 +224,6 @@ const mapDispatchToProps = (dispatch) =>
 		{
 			dispatch(requestActions.unmutePeerAudio(peerName));
 		},
-		onEnableWebcam : (peerName) =>
-		{
-
-			dispatch(requestActions.resumePeerVideo(peerName));
-		},
-		onDisableWebcam : (peerName) =>
-		{
-			dispatch(requestActions.pausePeerVideo(peerName));
-		},
-		onEnableScreen : (peerName) =>
-		{
-			dispatch(requestActions.resumePeerScreen(peerName));
-		},
-		onDisableScreen : (peerName) =>
-		{
-			dispatch(requestActions.pausePeerScreen(peerName));
-		},
 		toggleConsumerFullscreen : (consumer) =>
 		{
 			if (consumer)
diff --git a/app/stylus/components/Peer.styl b/app/stylus/components/Peer.styl
index 7221917..1f1d493 100644
--- a/app/stylus/components/Peer.styl
+++ b/app/stylus/components/Peer.styl
@@ -193,6 +193,28 @@
 		}
 	}
 
+	.paused-video {
+		position: absolute;
+		z-index: 11;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		> p {
+			padding: 6px 12px;
+			border-radius: 6px;
+			user-select: none;
+			pointer-events: none;
+			font-size: 20px;
+			color: rgba(#fff, 0.55);
+		}
+	}
+
 	.incompatible-video {
 		position: absolute;
 		z-index: 10;
@@ -210,7 +232,7 @@
 			border-radius: 6px;
 			user-select: none;
 			pointer-events: none;
-			font-size: 15px;
+			font-size: 20px;
 			color: rgba(#fff, 0.55);
 		}
 	}
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 1545fa6..87f45f1 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -298,7 +298,7 @@ class Room extends EventEmitter
 			// Return no error
 			cb(null);
 
-			const fileData = request.data.file;
+			const fileData = request.file;
 
 			this._fileHistory.push(fileData);
 
@@ -321,10 +321,10 @@ class Room extends EventEmitter
 			// Return no error
 			cb(null);
 
-			const { raiseHandState } = request.data;
+			const { raiseHandState } = request;
 			const { mediaPeer } = signalingPeer;
 
-			mediaPeer.appData.raiseHandState = request.data.raiseHandState;
+			mediaPeer.appData.raiseHandState = request.raiseHandState;
 			// Spread to others
 			signalingPeer.socket.broadcast.to(this._roomId).emit(
 				'raisehand-message',