diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index ece6aef0f20..b5d14c441d0 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -12,27 +12,35 @@ Those days are over!
Introducing **ImmuniMate**, our innovative platform designed to revolutionize the way healthcare professionals and staff manage patient information.
It's your secure, centralized hub where you can access all your patients' medical and personal details – allergies, visit history, medical conditions, you name it – just a few clicks away!
+## Who This App is For
+
ImmuniMate is designed for healthcare professionals (doctors, nurses etc.) and healthcare staff (clinic receptionist etc.) longing to leverage the efficiencies of the 21st century, who:
* have basic experience in using computers
-* have a computer with sufficient space (~50 MB)
+* have a computer with sufficient space (~100 MB)
* are comfortable typing on a regular basis
* have no serious colour vision deficiencies (can differentiate red, yellow and green)
+## Purpose of This Guide
+
If you ticked all the points above, great!
This user guide is here as your helping hand, imparting knowledge to unlock the full potential of ImmuniMate.
You can start with learning to navigate this guide effectively by viewing guidelines on how to use this guide.
After that, get started with ImmuniMate by following our step-by-step setup instructions, before really getting involved through short tutorials on its comprehensive set of features.
Get ready to:
-* Enhance Patient Care: Deliver faster, more informed consultations with easy access to vital information.
-* Boost Efficiency: Save precious time by ditching paper records and streamlining your workflow.
-* Revitalise Patients: Use organised information about your patients to offer them peronalised medical advice.
+* **Enhance Patient Care**: Deliver faster, more informed consultations with easy access to vital information.
+* **Boost Efficiency**: Save precious time by ditching paper records and streamlining your workflow.
+* **Revitalise Patients**: Use organised information about your patients to offer them peronalised medical advice.
Ready to take patient service to the next level?
Time to ditch those stacks of paper and Excel spreadsheets, and embrace the future of healthcare.
Let's dive in and explore how ImmuniMate can transform your practice!
+-------------------------------------------
+
+## Table of Contents
+
* Table of Contents
{:toc}
@@ -119,7 +127,7 @@ This means each feature of ImmuniMate is only accessible through typing a comman
Here is a graphic on components of the GUI and their functions:
-
+
The list of commands and their formats are specified below:
@@ -165,22 +173,34 @@ The list of fields and their formats are specified below:
| **Diagnosis** | `d/` | Any text. Blank or empty text is not accepted. | No |
| **Date of visit** | `dov/` | `yyyy-MM-dd` format. | No |
-Sometimes, you might type in commands in the wrong format, or fields that don't make sense, and that's fine.
+## Error Messages
+
+Sometimes, **you might type in commands in the wrong format**, or fields that don't make sense, and that's fine.
When that happens, the erroneous command you typed will light up in red, while more details on the nature of the error will be shown in the feedback box, like in the picture below.
![Error Message](images/ErrorMessage.png)
-Not to worry, you can just edit that command, or delete it and type in a correct one.
-**TIP**: Find retyping commands a hassle? Use your 'Up' and 'Down' arrow keys to access your past commands saved in your [Command History](#command-history)!
+Not to worry, you can just edit that command, or delete it and type in a correct one.
+
+