Refactor the click handlers for requests

Change-Id: I148ceac9b95aaf4a593a8f2c8a344cbcd4fc6e85
Merge "Refactor the click handlers for requests"