Additional layout modifications