diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 20087625011..0b01bab4c7e 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -23,8 +23,45 @@ If you're new to the Command-Line Interface and need assistance, this User Guide
 
 <!-- * Table of Contents -->
 <page-nav-print />
-* Table of Contents
-  {:toc}
+
+### Table of Contents
+
+* [Introduction](#introduction)
+  * [Table of Contents](#table-of-contents) 
+  * [How to use the User Guide](#how-to-use-the-user-guide)
+* [Graphical User Interface](#graphical-user-interface)
+  * [Task Card](#task-card)
+  * [Consultation Card](#consultation-card)
+  * [Session Card](#session-card)
+* [Quick start](#quick-start)
+* [Command Format](#command-format)
+  * [Command Parameters](#command-parameters)
+* [Features](#features)
+  * [Viewing help : `help`](#viewing-help--help)
+  * [Adding a person: `add`](#adding-a-person--add)
+  * [Listing all persons : `list`](#listing-all-persons--list)
+  * [Editing a person : `edit`](#editing-a-person--edit)
+  * [Locating persons by name: `find`](#locating-persons-by-name--find)
+  * [Deleting a person : `delete`](#deleting-a-person--delete)
+  * [Clearing all entries : `clear`](#clearing-all-entries--clear)
+  * [Exiting the program : `exit`](#exiting-the-program--exit)
+  * [Saving the data](#saving-the-data)
+  * [Editing the data file](#editing-the-data-file)
+  * [Archiving data files `[coming in v2.0]`](#archiving-data-files-coming-in-v20)
+  * [Adding a Task: `addtask`](#adding-a-task--addtask)
+  * [Viewing Tasks: `viewtasks`](#viewing-tasks--viewtasks)
+  * [Updating a Task's Progress: `updateprogress`](#updating-a-tasks-progress--updateprogress)
+  * [Deleting a Task: `deletetask`](#deleting-a-task--deletetask)
+  * [Creating a Consult: `createconsult`](#creating-a-consult--createconsult)
+  * [Showing list of consultations: `showconsults`](#showing-list-of-consultations--showconsults)
+  * [Viewing details of a consultation: `viewconsult`](#viewing-details-of-a-consultation--viewconsult)
+  * [Adding students to a consultation: `addtoconsult`](#adding-students-to-a-consultation--addtoconsult)
+  * [Removing students from a consultation: `removefromconsult`](#removing-students-from-a-consultation--removefromconsult)
+  * [Deleting a consultation: `deleteconsult`](#deleting-a-consultation--deleteconsult)
+* [FAQ](#faq)
+* [Known issues](#known-issues)
+* [Command summary](#command-summary)
+
 
 ### How to use the User Guide
 You may refer to the **Table of Contents** on the right for easy navigation of the User Guide.
@@ -39,6 +76,8 @@ The F.A.K.E.J.A.R.V.I.S. User Guide employs a variety of visual cues to enhance
 | **<div markdown="span" class="alert alert-info"> :information_source: Note </div>** | Provides information of special interest or importance.         |
 | **<div markdown="span" class="alert alert-warning"> :bangbang: Warning </div>**     | Alerts to potentially irreversible actions with data loss risk. |
 
+--------------------------------------------------------------------------------------------------------------------
+
 
 ## Graphical User Interface
 
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
index e8c86a948e3..3fba7bb46e3 100644
--- a/src/main/java/seedu/address/MainApp.java
+++ b/src/main/java/seedu/address/MainApp.java
@@ -264,6 +264,7 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
     @Override
     public void start(Stage primaryStage) {
         logger.info("Starting AddressBook " + MainApp.VERSION);
+        primaryStage.setMaximized(true);
         ui.start(primaryStage);
     }
 
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index f789cd42e9e..bdca75e5624 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -47,7 +47,7 @@
           </padding>
         </StackPane>
 
-        <HBox styleClass="pane-with-border">
+        <HBox styleClass="pane-with-border" VBox.vgrow="ALWAYS">
           <VBox fx:id="personList"  minWidth="300" prefWidth="300" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
             <Label text="Person List" maxWidth="Infinity" wrapText="true" styleClass="section-label"/>
             <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>