diff --git a/public/css/vroom.css b/public/css/vroom.css
index 6f4207d..82f69dc 100644
--- a/public/css/vroom.css
+++ b/public/css/vroom.css
@@ -39,8 +39,15 @@
   margin-bottom: 5px;
   display: none;
 }
-.previewContainer:nth-child(2n+1){
-  clear: left;
+@media screen and (min-width: 768px) {
+  .previewContainer:nth-child(2n+1){
+    clear: left;
+  }
+}
+@media screen and (max-width: 767px) {
+  .previewContainer:nth-child(4n+1){
+    clear: left;
+  }
 }
 .volumeBar {
   position: absolute;
diff --git a/public/js/vroom.js b/public/js/vroom.js
index e618491..5832972 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -513,7 +513,7 @@ function initVroom(room) {
     playSound('join.mp3');
     // The div continer of this new video
     // will contain the video preview plus all other info like displayName, overlay and volume bar
-    var div = $('<div></div>').addClass('col-xs-6 col-sm-12 col-lg-6 previewContainer').append(video).appendTo('#webRTCVideo');
+    var div = $('<div></div>').addClass('col-xs-3 col-sm-12 col-lg-6 previewContainer').append(video).appendTo('#webRTCVideo');
     var id;
     // Peer isn't defined ? it's our own local screen
     if (!peer){
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index 73c1511..442e22a 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -36,7 +36,7 @@
             </button>
           </div>
           <% if ($etherpad eq 'true'){ %>
-          <div class="btn-group hidden-xs" data-toggle="buttons">
+          <div class="btn-group" data-toggle="buttons">
             <label class="btn btn-default help" id="etherpadLabel" data-toggle="tooltip" data-placement="bottom" title="<%=l 'OPEN_ETHERPAD' %>">
               <input type = "checkbox" id="etherpadButton">
                 <span class="glyphicon glyphicon-pencil">
@@ -869,7 +869,7 @@
       <audio id="mohPlayer" src="<%= $self->get_url('/') %>snd/moh/<%= $moh %>" loop></audio>
       <div id="view" class="view row-fluid">
         <div id="webRTCVideo" class="col-xs-12 col-sm-4">
-          <div class="col-xs-6 col-sm-12 col-lg-6 previewContainer" id="videoLocalContainer">
+          <div class="col-xs-3 col-sm-12 col-lg-6 previewContainer" id="videoLocalContainer">
             <video id="webRTCVideoLocal" class="webRTCVideo latencyUnknown" muted oncontextmenu="return false;">
             </video>
             <div id="localVolume" class="volumeBar">
@@ -878,7 +878,7 @@
             </div>
           </div>
         </div>
-        <div id="mainView" class="col-sm-8 hidden-xs">
+        <div id="mainView" class="col-xs-12 col-sm-8">
           <% if ($etherpad eq 'true'){ %>
           <div id="etherpadContainer"></div>
           <% } %>