Develop - Changes by Yogesh

Fixes for review page