Taking out extra clickhandler