Fix missing OK button on confirm modal (#791)
Fix save error causing modal to break (#790)
Merge pull request #794 from porjo/master

Fix #790 #791