copy/layout improvements