Fix design glitches on mobile

Fixes #2019 and #2018. Sorry again for this :)