Develop - Changes by Nilesh, Priyanka and Yogesh

Fixes for issues sent by Client