fix onClick issues