Added Logs and OnClick