change Evaluate button behaviour

@phongngtuan please take your time to review it. Thanks