uniform clickhandler added