more layout changes.patch