Develop - Changes by Priyanka and Yogesh

1. Style changes by Priyanka
2. Fixes for issues found while testing by Yogesh