Stricter layout