This reverts commit 553b427c. It regressed the layout and didn't actually fix the visual glitch it was originally intended to fix