fix for duplicate
fixes close on cancel when red X is clicked
forgot to add text changes
app could not be closed :) fixed
Merge remote-tracking branch 'upstream/master'