Fix layout issues with latest