del redundant code & fix click not work