Close the popup after save is tapped
Add cancel button to the popup
Fix issue edina/fieldtrip-gb#35