diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index e993780b43a..294230316af 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -5,21 +5,32 @@ title: User Guide
## **Introduction - What is Elder Scrolls?**
-**Elder Scrolls** is a ___Volunteer Management System (VMS)___ designed to streamline the coordination of volunteers and befriendees, with a particular focus on elderly befriending programs. Elder Scrolls combines the _speed of CLI interaction_ with the benefits of a _Graphical User Interface (GUI)_. Whether you prefer the agility of typing or the convenience of visual interaction, Elder Scrolls ensures that your volunteer management tasks are completed swiftly and seamlessly.
+{: style="text-align: justify" }
+**Elder Scrolls is a** ___free Volunteer Management System (VMS)___ that streamlines the coordination of volunteers and befriendees, with a particular focus on elderly befriending programs. Elder Scrolls combines the _speed of Command Line Interface (CLI) interaction_ with the _benefits of a Graphical User Interface (GUI)_. Whether you prefer the agility of typing or the convenience of visual interaction, Elder Scrolls ensures that your volunteer management tasks are completed swiftly and seamlessly.
-**Our target audience** primarily consists of _volunteer managers_ responsible for organizing and overseeing activities related to _elderly befriending initiatives_. Whether you're managing volunteers for elderly care, community outreach, or other social services, Elder Scrolls offers a comprehensive solution to simplify and enhance your volunteer management efforts.
+{: style="text-align: justify" }
+**Elder Scrolls is crafted with _volunteer managers_, and _organizers_ involved in elderly befriending initiatives in mind**. Whether you're managing volunteers for elderly care, community outreach, or other social services, Elder Scrolls offers a comprehensive solution for you to simplify and enhance your volunteer management efforts.
-**No more cumbersome bookkeeping**: manage volunteers and befriendees seamlessly in one intuitive platform. Say goodbye to endless spreadsheets – Elder Scrolls centralizes tasks, making them faster and more effective. Developed for efficiency by our team, ___Elder Scrolls lets you focus on what matters most – making a difference in the lives of others___.
+{: style="text-align: justify" }
+**No more cumbersome bookkeeping**: manage volunteers and befriendees seamlessly in one intuitive platform. Say goodbye to endless spreadsheets – Elder Scrolls centralizes tasks, making them faster and more effective, with **two main features**: ___Volunteer/Befriendee Management___, and ___Log Management___. These features allow you to effortlessly add and update your volunteers' and befriendees' information, and easily keep track of all the interactions between them.
+
+{: style="text-align: justify" }
+Developed for efficiency by our team, ___Elder Scrolls lets you focus on what matters most – making a difference in the lives of others___.
+
+
@@ -206,7 +252,7 @@ Constraints:
* `n/NAME` must be alphanumeric and cannot be empty.
* `p/PHONE_NUMBER` must be at least 3 digits long.
* `r/ROLE` must **only** be either `volunteer` or `befriendee`, which will add either a volunteer or befriendee respectively.
-* `e/EMAIL` must be a valid email address.
+* `e/EMAIL` must be a valid email address of the format `local-part@domain`.
* `a/ADDRESS` has no limitations but cannot have line breaks, i.e., it should be the single-line format for addresses.
* `t/TAG` must be alphanumeric.
* `n/NAME`, `r/ROLE`, `p/PHONE_NUMBER`, `e/EMAIL` and `a/ADDRESS` must be provided and cannot be empty.
@@ -244,9 +290,6 @@ Examples:
* `edit 1 r/volunteer p/91234567 e/johndoe@example.com` Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
* `edit 2 r/befriendee n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
-[//]: # (Page Break:)
-
-
#### 3.1.3 Pairing a befriendee and volunteer : `pair`
Pairs an existing befriendee and volunteer in Elder Scrolls.
@@ -260,9 +303,12 @@ Examples:
* `pair 1 2` Pairs the befriendee at Index 1 of the befriendee list and the volunteer at Index 2 of the volunteer list.
* `pair 3 3` Pairs the befriendee at Index 3 of the befriendee list and the volunteer at Index 3 of the volunteer list.
+[//]: # (Page Break:)
+
+
#### 3.1.4 Unpairing a befriendee and volunteer : `unpair`
-Pairs an existing befriendee and volunteer in Elder Scrolls.
+Unpairs an existing befriendee and volunteer in Elder Scrolls.
Format: `unpair BEFRIENDEE_INDEX VOLUNTEER_INDEX`
@@ -289,13 +335,16 @@ Examples:
#### 3.1.5 Listing all persons : `list`
-Shows a list of all persons in Elder Scrolls.
+Shows a list of all persons and logs in Elder Scrolls.
Format: `list`
-* Persons are listed in the order they were added, from earliest to latest.
+* Persons and Logs are listed separately, and in the order they were added, from earliest to latest.
* The list command is commonly used with the `find` command to reset the view after a search.
+[//]: # (Page Break:)
+
+
#### 3.1.6 Locating persons: `find`
Find persons through a variety of filters.
@@ -335,12 +384,15 @@ If the _case-sensitive_ `t/TAG` filter is provided, the search will be limited t
Example: `find t/friend` (finds all persons who have the tag `friend`)
+[//]: # (Page Break:)
+
+
##### By role: `r/ROLE`
The `r/ROLE` filter is provided, the search will be limited to the specified list. The other list remains unaffected.
Only two versions of this filter are allowed: `r/volunteer` and `r/befriendee`.
-
:bulb: **Disclaimer:**
+
:bulb: **Tip:**
The `r/ROLE` filter can only be applied together with another filter. It cannot be used on its own.
@@ -356,6 +408,10 @@ Example: `find r/volunteer David` (finds all volunteers with `David` in their na
Examples:
* `find alex david`
![result for 'find alex david'](images/findAlexDavidResult.png)
+
+[//]: # (Page Break:)
+
+
* `find r/volunteer t/student --paired Bernice` (finds all paired volunteers with the tag `student` and name containing `Bernice`)
![result for 'find Bernice'](images/findBerniceResult.png)
@@ -363,9 +419,6 @@ Examples:
Use the `list` command to reset your view after using the `find` command.
-[//]: # (Page Break:)
-
-
#### 3.1.7 Deleting a person : `delete`
Deletes the specified person from Elder Scrolls.
@@ -391,7 +444,7 @@ Examples:
#### 3.2.1 Adding a log : `logadd`
-Adds a log between a pair of befriendee and volunteer. If it is the most recent log for a befriendee or volunteer, their `latest log` card details updates accordingly.
+Adds a log for an existing paired befriendee and volunteer. If the added log is their most recent log, the respective persons' `latest log` card details updates accordingly.
Format: `logadd BEFRIENDEE_INDEX VOLUNTEER_INDEX t/TITLE s/START_DATE d/DURATION r/REMARKS`
@@ -400,7 +453,8 @@ Constraints:
* The two persons must be paired before a log can be added.
* The `START_DATE` must be in the format `YYYY-MM-DD`. Valid dates range from `0001-01-01` to `9999-12-31`. Only dates that exist in the standard Gregorian calendar are accepted.
* The `DURATION` **must be a positive integer** ranging from 1 to 999. We cannot guarantee correct behaviour for durations exceeding 999 hours.
-* `t/TITLE`, `s/START_DATE`, `d/DURATION` and `r/REMARKS` must be provided and cannot be empty.
+* `t/TITLE`, `s/START_DATE`, `d/DURATION` and `r/REMARKS` must be provided.
+* `s/START_DATE`, `d/DURATION` cannot be empty.
Examples:
* `logadd 1 1 t/Movies s/2020-01-09 d/3 r/had popcorn` Adds a log between the befriendee at Index 1 and the volunteer at Index 1 with the title `Movies`, start date `2020-01-09`, duration `3` and remarks `had popcorn`.
@@ -466,8 +520,8 @@ Format: `undo`
* Undo history will be erased when you exit the application.
Examples:
-* You have just mistakenly executed a `clear` command and cleared every entry in Elder Scrolls. You can simply execute the command `undo` to revert the changes and all your entries in Elder Scrolls will be restored to their previous state, before the `clear` command was executed.
-* If you've just performed multiple `delete` commands in sequence, and realised you've deleted the wrong entries. You can execute multiple `undo` commands to revert the changes made by the wrongful delete commands.
+* You mistakenly executed a `clear` command and cleared every entry in Elder Scrolls. You can simply execute the command `undo` to revert the changes and all your entries in Elder Scrolls will be restored to their previous state, before the `clear` command was executed.
+* You might have performed multiple `delete` commands in sequence, and realised you've deleted the wrong entries. Not to worry, you can execute multiple `undo` commands to revert the changes made by the wrongful delete commands.
#### 3.3.2 Revert the most recent undo command : `redo`
@@ -482,10 +536,9 @@ Format: `redo`
Examples:
* After executing a successful `undo` command, if you were to call any command that modifies the data in Elder Scrolls, such as `delete`, the `redo` command will not longer be available.
-* Let's say you've just executed a `add`, and mistakenly executed a `undo` command right after. You can then call `redo` to once again execute the `add` that was previously undone.
+* Let's say you've just executed an `add`, and mistakenly executed a `undo` command right after. You can then call `redo` to once again execute the `add` that was previously undone.
--------------------------------------------------------------------------------------------------------------------
-[//]: # (Page Break:)
### **3.4 Other Commands: Help, Clear and Exiting**
@@ -497,8 +550,7 @@ Format: `help`
* Any extraneous inputs/parameters (e.g. `help me`) will be ignored.
-
-
+
@@ -507,6 +559,10 @@ Format: `help`
Clears all entries from Elder Scrolls.
Format: `clear`
+
:bulb: **Tip:**
+Be careful when using the `clear` command as it will remove all entries from Elder Scrolls! However, if done accidentally, remember that you can always use the `undo` command to revert the changes made by the `clear` command!
+
+
#### 3.4.3 Exiting the program : `exit`
Exits the program.
@@ -514,7 +570,11 @@ Format: `exit`
## **4. Saving the data**
-Elder Scrolls data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually!
+Elder Scrolls data is saved in the hard disk automatically after any command that changes the data. There is no need to save manually!
+
+
:bulb: **Tip:**
+While Elder Scrolls saves automatically, you can also easily make backups and snapshots of your data! To do so, simply copy the `datastore.json` file located in the `data` folder of the Elder Scrolls home directory as a backup file! Making a backup copy is never a bad idea!
+
## **5. Editing the data file**
@@ -526,18 +586,22 @@ Furthermore, certain edits can cause the Elder Scrolls to behave in unexpected w
## **6. FAQ: Frequently Asked Questions**
+[Back to About & Table of Contents ←](#about-this-user-guide)
**Q**: ___Can I track volunteer hours and activities with Elder Scrolls?___