Issue #14: Cancel and Ok buttons are switched