Fixed #48. Reversed cancel / save buttons in pop-up