Updates for client feedback issues
Merge pull request #113 from yogeshchaugule/develop

Design - Changes by Yogesh