diff --git a/README.md b/README.md
index 588b6f73..c5a64c20 100644
--- a/README.md
+++ b/README.md
@@ -78,14 +78,6 @@ WSGIScriptAlias / /path_to_GraphSpace/graphspace/wsgi.py
 
 Refer to https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/modwsgi/ if any problems occur with the setup.
 
-Testing the GraphSpace REST API
-=================================
-
-1. Follow the instructions above to run GraphSpace locally or on Apache2.
-2. Navigate to the tests directory in GraphSpace: `cd tests`
-2. Enter python command to run test cases: `python restapi_test.py`
-
-This script will test all the REST API commands supported by the GraphSpace server.  If something fails, it will display the error.
 
 Contributing
 =================
diff --git a/static/js/graphs_page.js b/static/js/graphs_page.js
index 02da7544..559ecbf8 100644
--- a/static/js/graphs_page.js
+++ b/static/js/graphs_page.js
@@ -430,6 +430,16 @@ var graphPage = {
 
         utils.initializeTabs();
 
+        $('#saveOnExitLayoutBtn').click(function () {
+            graphPage.cyGraph.contextMenus('get').destroy(); // Destroys the cytocscape context menu extension instance.
+
+            cytoscapeGraph.showGraphInformation(graphPage.cyGraph);
+            // display node data as a popup
+            graphPage.cyGraph.unbind('tap').on('tap', graphPage.onTapGraphElement);
+
+            graphPage.saveLayout($('#saveOnExitLayoutNameInput').val(), '#saveOnExitLayoutModal');
+        });
+
         $('#saveLayoutBtn').click(function () {
             graphPage.cyGraph.contextMenus('get').destroy(); // Destroys the cytocscape context menu extension instance.
 
@@ -437,7 +447,7 @@ var graphPage = {
             // display node data as a popup
             graphPage.cyGraph.unbind('tap').on('tap', graphPage.onTapGraphElement);
 
-            graphPage.saveLayout($('#layoutNameInput').val());
+            graphPage.saveLayout($('#saveLayoutNameInput').val(), '#saveLayoutModal');
         });
 
         $('#layoutEditorBtn').click(function () {
@@ -445,6 +455,11 @@ var graphPage = {
         });
 
         $('#exitLayoutEditorBtn').click(function () {
+            $('#exitLayoutBtn').removeClass('hidden');
+            $('#saveOnExitLayoutModal').modal('show');
+        });
+
+        $('#saveLayoutEditorBtn').click(function () {
             $('#exitLayoutBtn').removeClass('hidden');
             $('#saveLayoutModal').modal('show');
         });
@@ -457,11 +472,6 @@ var graphPage = {
             graphPage.cyGraph.unbind('tap').on('tap', graphPage.onTapGraphElement);
         });
 
-        $('#saveLayoutModalBtn').click(function () {
-            $('#exitLayoutBtn').addClass('hidden');
-            $('#saveLayoutModal').modal('show');
-        });
-
         $('#ConfirmRemoveLayoutBtn').click(graphPage.layoutsTable.onConfirmRemoveGraph);
         $('#ConfirmUpdateLayoutBtn').click(graphPage.layoutsTable.onConfirmUpdateGraph);
 
@@ -584,7 +594,7 @@ var graphPage = {
         graphPage.cyGraph.layout(layout);
 
     },
-    saveLayout: function (layoutName) {
+    saveLayout: function (layoutName, modalNameId) {
         graphPage.cyGraph.elements().unselect();
 
         if (_.trim(layoutName).length === 0) {
@@ -636,7 +646,7 @@ var graphPage = {
                     }
                 },
                 successCallback = function (response) {
-                    $('#saveLayoutModal').modal('toggle');
+                    $(modalNameId).modal('toggle');
                     $('#PrivateLayoutsTable').bootstrapTable('refresh');
                     $('#SharedLayoutsTable').bootstrapTable('refresh');
                 },
diff --git a/templates/graph/index.html b/templates/graph/index.html
index 8eb07ba2..bea8db4b 100644
--- a/templates/graph/index.html
+++ b/templates/graph/index.html
@@ -75,9 +75,9 @@ <h4 class="modal-title" id="myModalLabel">Share Graph</h4>
                 </div>
             </div>
         </div>
-
-        <!-- Save Layout Modal -->
-        <div class="modal fade" id="saveLayoutModal" tabindex="-1" role="dialog" aria-labelledby="saveLayoutModalLabel"
+    
+        <!-- Save on Exit Layout Modal -->
+        <div class="modal fade" id="saveOnExitLayoutModal" tabindex="-1" role="dialog" aria-labelledby="saveOnExitLayoutModalLabel"
              aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -89,14 +89,13 @@ <h4 class="modal-title" id="myModalLabel">Save Layout</h4>
                         <div class="layout_fields">
                             <div class="control-group">
                                 <label for="layoutNameInput">Layout Name</label>
-                                <input id="layoutNameInput" class="form-control" type="text" name="layout_name"
+                                <input id="saveOnExitLayoutNameInput" class="form-control" type="text" name="layout_name"
                                        autocomplete="off"/>
                             </div>
                             <br>
                             <div class="form-group">
-                                <button name="saveLayoutBtn" id="saveLayoutBtn"
+                                <button name="saveOnExitLayoutBtn" id="saveOnExitLayoutBtn"
                                         class="btn btn-success sidebar-nav-pills" data-target="#defaultSideBar">Save
-                                    Layout
                                 </button>
                                 <button type="button" id="exitLayoutBtn"
                                         class="btn btn-success hidden sidebar-nav-pills" data-target="#defaultSideBar"
@@ -111,6 +110,36 @@ <h4 class="modal-title" id="myModalLabel">Save Layout</h4>
             </div>
         </div>
 
+        <!-- Save Layout Modal -->
+        <div class="modal fade" id="saveLayoutModal" tabindex="-1" role="dialog" aria-labelledby="saveLayoutModalLabel"
+             aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title" id="myModalLabel">Save Layout</h4>
+                    </div>
+                    <div class="modal-body">
+
+                        <div class="layout_fields">
+                            <div class="control-group">
+                                <label for="layoutNameInput">Layout Name</label>
+                                <input id="saveLayoutNameInput" class="form-control" type="text" name="layout_name"
+                                       autocomplete="off"/>
+                            </div>
+                            <br>
+                            <div class="form-group">
+                                <button name="saveLayoutBtn" id="saveLayoutBtn"
+                                        class="btn btn-success sidebar-nav-pills" data-target="#layoutEditorSideBar">Save
+                                </button>
+                                <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div>
     <!--- Modals end here--->
     <div class="container-fluid zero-margin zero-padding">
diff --git a/templates/graph/layout_editor_sidebar.html b/templates/graph/layout_editor_sidebar.html
index 1a55bb0c..caa8742a 100644
--- a/templates/graph/layout_editor_sidebar.html
+++ b/templates/graph/layout_editor_sidebar.html
@@ -6,6 +6,12 @@
         <a id="exitLayoutEditorBtn" class="btn btn-xs d-inline-block" href="#">
             <i class="fa fa-chevron-left"></i> Exit Layout Editor
         </a>
+        <a id="saveLayoutEditorBtn" class="btn btn-xs d-inline-block" href="#">
+            Save
+        </a>
+    </li>
+
+    <li>
         <a id="startTourBtn" class="btn btn-xs d-inline-block" href="#">
             Start Tour
         </a>
diff --git a/templates/upload_graph/index.html b/templates/upload_graph/index.html
index b456d47f..a5cea909 100644
--- a/templates/upload_graph/index.html
+++ b/templates/upload_graph/index.html
@@ -58,7 +58,7 @@ <h1 class="text-center">Upload Graph</h1>
                                     <div class="input-group col-xs-12">
                                         <input type="text" class="browse form-control"
                                                placeholder="Required">
-                                        <span class="input-group-btn">
+                                        <span class="browse input-group-btn">
                                             <button class="browse btn btn-default" type="button">
                                                 <i class="glyphicon glyphicon-search"></i> Browse
                                             </button>
@@ -75,7 +75,7 @@ <h1 class="text-center">Upload Graph</h1>
                                     <div class="input-group col-xs-12">
                                         <input type="text" class="browse form-control"
                                                placeholder="Optional">
-                                        <span class="input-group-btn">
+                                        <span class="browse input-group-btn">
                                             <button class="browse btn btn-default" type="button">
                                                 <i class="glyphicon glyphicon-search"></i> Browse
                                             </button>