Auto-commit:  some more layout