Design - Changes by Yogesh

Updates for client feedback issues