Fix layouts.
Fix #7.