layout and copy fixes