Develop - Changes by Yogesh

1. Fixes for client feedback