layout fix, and fix diff command