Fix row spanning for multiple levels