Further layout modifications