Develop - Changes by Yogesh

Styling fixes