Layout adaptations II