Improve RuleTarget
Correct UI