Tweaks to work better on devices with varying widths