Merge pull request #21 from frankmu/master

fix navigate back after save button
loading