diff --git a/resources/www/prod/js/jquery.main-prod.js b/resources/www/prod/js/jquery.main-prod.js
index 0cfac327ad..93bb753394 100644
--- a/resources/www/prod/js/jquery.main-prod.js
+++ b/resources/www/prod/js/jquery.main-prod.js
@@ -751,18 +751,19 @@ function linearize() {
         $('#answers .list').width(w);
     }
     else {
-
+        var minMargin = 5;
         var margin = 0;
         var el = $('#answers .diapo:first');
-        var brdrWidth = el.css('border-width');
-        var stdWidth = el.outerWidth() + 10;
+        var diapoWidth = el.outerWidth() + (minMargin * 2);
         var fllWidth = $('#answers').innerWidth();
-        fllWidth -= 16;
+        fllWidth -= 26;
 
-        var n = Math.floor(fllWidth / (stdWidth));
+        var n = Math.floor(fllWidth / (diapoWidth));
 
-        margin = Math.floor((fllWidth % stdWidth) / (2 * n));
-        $('#answers .diapo').css('margin', '5px ' + (5 + margin) + 'px');
+        margin = Math.floor((fllWidth % diapoWidth) / (2 * n));
+        margin = margin + minMargin;
+
+        $('#answers .diapo').css('margin', '5px ' + (margin) + 'px');
     }
 
 }
@@ -1209,7 +1210,7 @@ $(document).ready(function () {
             $('#idFrameC .icon-menu li').last().find('a').trigger('click');
             $('#idFrameC .icon-menu li').first().find('a').trigger('click');
             $(previousTab).find('a').trigger('click');
-        }        
+        }
 
         event.stopImmediatePropagation();
         //p4.WorkZone.close();
diff --git a/resources/www/prod/skins/skin-shared.scss b/resources/www/prod/skins/skin-shared.scss
index 075236f566..ef9f116ed7 100644
--- a/resources/www/prod/skins/skin-shared.scss
+++ b/resources/www/prod/skins/skin-shared.scss
@@ -88,10 +88,6 @@ a:hover {
   TEXT-DECORATION: none
 }
 
-#desktop {
-  min-width: 1100px;
-}
-
 EM {
   FONT-STYLE: normal;
   BACKGROUND-COLOR: #D82400;
diff --git a/resources/www/prod/skins/ui-components/_answers.scss b/resources/www/prod/skins/ui-components/_answers.scss
index ae2adf5193..977b5a7fb6 100644
--- a/resources/www/prod/skins/ui-components/_answers.scss
+++ b/resources/www/prod/skins/ui-components/_answers.scss
@@ -38,6 +38,7 @@ $answersInfoLabelColor: #949494 !default;
 
 
 #answers {
+  box-sizing: border-box;
   .status {
     img {
       max-width: 16px;