Unifies layout for manses across API versions