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