Ajay/Melanie | #3181 | Refactoring - Removed multiple click handlers being initialized