Fix design glitches on mobile
Merge pull request #2020 from jalyna/fix-mobile-glitches

Fix design glitches on mobile