Problem: It's difficult and not user-friendly when using Edit feature: Have to enter or leave the Edit Mode. User click on the "Save" button in the popup editing text but it doesn't mean to save. Solution: Allow users to use shortcut to save the edit, eg. "Ctrl + S" -> this is the common behavior when user edit something offline or not auto save -> they will continuously use the shortcut to save their work. The "Save" button in the popup editing the text make user confused. They thought the text is saved but it is not. => Change the "Save" button wording to "Apply" or "Done" Show "Unsaved" status or banner to warn the Edit is not auto saved. => the banner may only need to show couples of times when user firsts use Edit feature to educate user. Implement versions of the document and allow user to restore the version and let user know this feature -> by this way, users dont have to worry about overwriting the file. May think about the feature to ask user to save this in the original file or a copied file. Actions related: The layout of the Edit Viewer should be changed -> Categorize into different groups so that users can know where to look for their desired button. The versions of document and ability to restore the version should be implemented