some design improvement + click event not working