Merge branch 'hotfix/imgmargins'
Fix overflow on small width devices
Merge branch 'hotfix/lioverflow' into develop