diff --git a/src/styles/components/_youtubevideo.scss b/src/styles/components/_youtubevideo.scss
index c56f8a14..0ecde682 100644
--- a/src/styles/components/_youtubevideo.scss
+++ b/src/styles/components/_youtubevideo.scss
@@ -81,15 +81,6 @@
   display: block;
 }
 
-.youtubevideo .row {
-  margin-bottom: 15px;
-}
-
-.youtubevideo label {
-  color: white;
-  text-shadow: 1px 1px 1px $text-color;
-}
-
 .youtubevideo .overlaybar {
   bottom: 0;
   left: 0;
@@ -100,3 +91,15 @@
   width: 100%;
   max-width: 100%;
 }
+
+.youtubevideo .overlaybar-input {
+  position: relative;
+  width: 100%;
+  padding-right: 15px;
+}
+
+.youtubevideo .overlaybar-content form .overlaybar-buttons {
+  position: absolute;
+  right: 23px;
+  top: 6px;
+}
diff --git a/static/partials/youtubevideo.html b/static/partials/youtubevideo.html
index f0de9c0d..d0e6b5d8 100644
--- a/static/partials/youtubevideo.html
+++ b/static/partials/youtubevideo.html
@@ -19,14 +19,6 @@
 					</center>
 				</div>
 			</div>
-			<!--
-			<div class="row welcome" ng-show="!playbackActive">
-				<h1 class="fa fa-youtube"></h1>
-				<div class="center-block">
-					<p>{{_('Videos are shared with everyone in this call.')}}</p>
-				</div>
-			</div>
-			-->
 
 			<div ng-show="playbackActive">
 				<div class="row" id="youtubecontainer">
@@ -44,19 +36,17 @@
 	<div class="overlaybar form-horizontal" ng-class="{notvisible: hideControlsBar}">
 		<a class="overlaybar-button" ng-model="hideControlsBar" btn-checkbox btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('YouTube controls')}}"><i class="fa fa-cogs"></i></a>
 		<div class="overlaybar-content">
-			<div class="container-fluid form-horizontal">
+			<form class="container-fluid" role="form">
 				<div class="form-group">
-					<label class="col-sm-2" for="youtubeurl">YouTube URL to share</label>
-					<div class="col-sm-10">
-						<input type="text" class="form-control" id="youtubeurl" ng-model="youtubeurl" required placeholder="{{_('YouTube URL')}}">
-					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-sm-offset-2 col-sm-10">
-						<button type="button" class="btn btn-primary" ng-click="shareVideo(youtubeurl)" ng-disabled="youtubeurl === ''">{{_('Share')}}</button>
+					<label for="youtubeurl">YouTube URL to share</label>
+					<div class="overlaybar-input">
+						<input type="text" class="form-control input-lg" id="youtubeurl" ng-model="youtubeurl" required placeholder="{{_('YouTube URL')}}">
+						<div class="overlaybar-buttons">
+							<button type="button" class="btn btn-primary" ng-click="shareVideo(youtubeurl)" ng-disabled="youtubeurl === ''">{{_('Share')}}</button>
+						</div>
 					</div>
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
 </div>