Layout tweaks to get margins matching up.