case 2982 - Added a fix into JS for mobile version.
Merge remote-tracking branch 'easyting/case-2982' into case-3278
case 3278 - Make sure to keep proportions in narrow and normal layout.
Merge branch 'case-3278' into develop