Design - Changes by Priyanka and Yogesh

Fixes for issues