Rework the "fit" and "fill" layouts.