Design changes and email_orders updated
Merge pics pull with design changes and email_orders update