copy/layout fixes