Layout tweaks to ensure content doesn't get any wider than its maximum width, in narrower layouts