Reworking how the default layouts are setup.