Fix layout issue, fix for M3.