Element click improvements