add clickHandler and some edit