Updated copy and layout a bit