Fixes #1469 - save button doesn't appear to always work. Also fixes some other issues such as flickering visible message about 'you are about to navigate away' and issue where dialog is still visible after being 'dismissed' when you use back button to return to the edit page.