Layout tweaks to hopefully solve overlap issues when viewed on certain screens.