Ajay | #3363 | Refactored click handler from anonymous function to click handler