Merge pull request #122 from yogeshchaugule/design

Design - changes by Sonia
Fixes for commerce workflow
Merge pull request #123 from yogeshchaugule/develop

Develop - Changes by Yogesh