Added onClick events

Change-Id: I2ceb9710e3560c020a419e0f4eec02249bdbb04e