Working on issue of update button
Discuss with Harsh and Fix merge conflict