ECOM-783 style and copy changes based on review comments from Griff