Layout adjustments so that we have more padding before we go under the edge