Develop - Changes by Yogesh

fixed small issues mentioned by Jas