Layout adaptations