Issue #85 , better cancel button