diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 857bdd96d43..4ce9330948a 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -429,7 +429,6 @@ $$
 \quad
 \underset{
     \substack{
-        \text{\color{red}{Optional}} \\
         \text{\color{red}{can have multiple}}
     }
 }{
@@ -450,12 +449,12 @@ The people who will be listed are people who are:
 ##### Examples:
 
 * `filter c/NUS Cycling`
-* `filter c/NUS Cycling r/classmates`
-* `filter c/NUS Cycling r/classmates r/colleagues`
+* `filter c/NUS Cycling r/Logistics`
+* `filter c/NUS Cycling r/Logistics r/Outreach`
 
 ##### Outcome:
 
-For `filter c/NUS Cycling r/classmates r/colleagues`:
+For `filter c/NUS Cycling r/Logistics r/Outreach`:
 <center>
 <img width="700px" src="images/UG-Basics/filter-output-1.png">
 </center>
@@ -565,7 +564,6 @@ $$
 
 * `add n/John Doe p/98765432 e/johnd@example.com a/6 Sin Ming #01-01`
 * `add n/John Doe p/98765432 e/johnd@example.com a/6 Sin Ming #01-01 c/NUS Cycling c/NUS Origami`
-* `add n/John Doe p/98765432 e/johnd@example.com a/6 Sin Ming #01-01 r/Treasurer r/Logistics`
 * `add n/John Doe p/98765432 e/johnd@example.com a/6 Sin Ming #01-01 d/Manages money`
 
 ##### Outcome:
@@ -721,7 +719,7 @@ Roles.
 Suppose we start with this list of people displayed in the **Results Box**.
 
 <center>
-<img src="images/editcommandoutcome1.png" >
+<img src="images/listcommandoutcome.png" >
 </center>
 
 We then run the following command:
@@ -799,7 +797,7 @@ For `assign 1 r/Treasurer`
 ##### Possible Failures:
 
 - The [_Index of person_](#glossary) must be within range. For example, it must be greater than 0, and smaller than the length of the currently displayed list of people. This is because the [_Index of person_](#glossary) will be used to indicate which person to operate the command on.
-- If the CCA is `nil` (for instance, the command you ran is `assign 1 r/nil`), the command will error out.
+- If the Role is `nil` (for instance, the command you ran is `assign 1 r/nil`), the command will error out.
 
 <box type="tip"><md>
 **Tip**: If you intend to remove all roles for a person, try running `edit <index of person> r/nil`, (see the [`edit` command](#editing-a-person-edit)). 
@@ -1011,7 +1009,7 @@ This is because a person without a CCA should not have any roles.
 
 Suppose we start with this list of people displayed in the **Results Box**.
 
-<img src="images/UG-Basics/outcomeCca_deleteBefore.png" >
+<img src="images/listcommandoutcome.png" >
 
 We then run the following command:
 
@@ -1021,7 +1019,7 @@ cca_delete c/NUS Cycling
 
 <img src="images/UG-Basics/outcomeCca_deleteAfter1.png" >
 
-Notice that the CCA of the person `Caleb Hugh` has been removed.
+Notice that the CCA of the people in our list has been removed.
 
 ##### Possible Failures:
 
diff --git a/docs/images/UG-Basics/filter-output-1.png b/docs/images/UG-Basics/filter-output-1.png
index 6a3d8f5a4bc..716971373ca 100644
Binary files a/docs/images/UG-Basics/filter-output-1.png and b/docs/images/UG-Basics/filter-output-1.png differ
diff --git a/docs/images/UG-Basics/find-output-1.png b/docs/images/UG-Basics/find-output-1.png
index 2300f95e136..cbefe40553d 100644
Binary files a/docs/images/UG-Basics/find-output-1.png and b/docs/images/UG-Basics/find-output-1.png differ
diff --git a/docs/images/UG-Basics/outcomeCca_deleteAfter1.png b/docs/images/UG-Basics/outcomeCca_deleteAfter1.png
index 1ad3c79cceb..a5be79a3948 100644
Binary files a/docs/images/UG-Basics/outcomeCca_deleteAfter1.png and b/docs/images/UG-Basics/outcomeCca_deleteAfter1.png differ
diff --git a/docs/images/editcommandoutcome2.png b/docs/images/editcommandoutcome2.png
index 13f793c703d..4ef11b9e051 100644
Binary files a/docs/images/editcommandoutcome2.png and b/docs/images/editcommandoutcome2.png differ
diff --git a/docs/images/listcommandoutcome.png b/docs/images/listcommandoutcome.png
index eb35c236e68..46724f9e746 100644
Binary files a/docs/images/listcommandoutcome.png and b/docs/images/listcommandoutcome.png differ