Fix layout bug with latest dependencies.