Improved copy and layout