fixed click event from layout changes