Add generic OK CANCEL dialog, fix issue #2