diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 09fa880e22..1734f231ce 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,6 +3,21 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
 
 This is built on the Jupyter Notebook v4.4.1 (more notes will follow).
 
+### Version 3.6.0
+- SCT-400 - Deprecates the old Import panel, change text from "Staging (beta)" -> "Import (new)"
+- SCT-417
+  - All older Import functionality should now be available in the new Import panel.
+  - Adds a link to create an app for uploading from a public URL into the staging area.
+  - Cleans up unclear text in the new Import panel.
+  - Adds new (hopefully informative) steps to the Import panel tour.
+  - Move the 'decompress file' button so it should always be visible for archives.
+- PTV-225 - Add more icon clarity to the data sorting options.
+- PTV-886 - Restore missing scrollbar in the Narratives panel.
+- KBASE-5410 - Improve job log viewer, add different.
+- SCT-291 - Initial addition of tools for programmatically accessing the FTP file staging area.
+- SCT-405 - Custom compounds will now display properly in the media viewer.
+- KBASE-5417 - Fix long strings not wrapping correctly when showing object metadata in the Data panel.
+
 
 ### Version 3.5.2
 - PTV-682 - Fix problem with rendering a Pangenome widget in a copied Narrative.
diff --git a/bower.json b/bower.json
index 090e8d3823..3a695fb0b3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kbase-narrative",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "homepage": "https://kbase.us",
   "dependencies": {
     "bluebird": "3.4.7",
diff --git a/kbase-extension/static/kbase/css/kbaseNarrative.css b/kbase-extension/static/kbase/css/kbaseNarrative.css
index 1f999feaaf..35018675eb 100644
--- a/kbase-extension/static/kbase/css/kbaseNarrative.css
+++ b/kbase-extension/static/kbase/css/kbaseNarrative.css
@@ -1233,8 +1233,8 @@ div#notebook_panel {
     height: 100%;
 }
 .kb-narr-panel-body-wrapper {
-    height: calc(100% - 40px);
-    padding: 3px;
+    overflow-y: auto;
+    height: 100%;
 }
 .kb-narr-panel-body-wrapper > div{
     height: 100%;
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
index a0cd380f90..b896b1e30c 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
@@ -1410,9 +1410,22 @@ define([
                 .on('click', function () {
                     self.reverseData();
                     self.sortOrder *= -1;
-                    $upOrDown.find('.fa').toggleClass('fa-sort-amount-desc fa-sort-amount-asc');
+                    var $icon = $upOrDown.find('.fa');
+                    if ($icon.is('.fa-sort-amount-desc,.fa-sort-amount-asc')) {
+                        $icon.toggleClass('fa-sort-amount-desc fa-sort-amount-asc');
+                    }
+                    else {
+                        $icon.toggleClass('fa-sort-alpha-desc fa-sort-alpha-asc');
+                    }
                 });
 
+            var setSortIcon = function(newIcon) {
+                $upOrDown
+                    .find('.fa')
+                    .removeClass()
+                    .addClass('fa ' + newIcon);
+            }
+
             var $byDate = $('<label id="nar-data-list-default-sort-label" class="btn btn-default">').addClass('btn btn-default')
                 .append($('<input type="radio" name="options" id="nar-data-list-default-sort-option" autocomplete="off">'))
                 .append('date')
@@ -1421,6 +1434,7 @@ define([
                         return self.sortOrder * self.dataObjects[a.objId].info[3]
                             .localeCompare(self.dataObjects[b.objId].info[3]);
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-amount-desc' : 'fa-sort-amount-asc');
                 });
 
             var $byName = $('<label class="btn btn-default">')
@@ -1431,6 +1445,7 @@ define([
                         return -1 * self.sortOrder * self.dataObjects[a.objId].info[1].toUpperCase()
                             .localeCompare(self.dataObjects[b.objId].info[1].toUpperCase());
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-alpha-desc' : 'fa-sort-alpha-asc');
                 });
 
             var $byType = $('<label class="btn btn-default">')
@@ -1442,6 +1457,7 @@ define([
                         var bType = self.dataObjects[b.objId].info[2].toUpperCase().match(/\.(.+)/)[1];
                         return -1 * self.sortOrder * aType.localeCompare(bType);
                     });
+                    setSortIcon(self.sortOrder > 0 ? 'fa-sort-alpha-desc' : 'fa-sort-alpha-asc');
                 });
 
 
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js
index b92224b58f..b1051cb3d7 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePanel.js
@@ -56,23 +56,22 @@ define(
             init: function(options) {
                 this._super(options);
                 var analysisWidgets = this.buildPanelSet([{
-                        name: 'kbaseNarrativeDataPanel',
-                        params: {
-                            collapseCallback: $.proxy(function(isMinimized) {
-                                this.handleMinimizedDataPanel(isMinimized);
-                            }, this)
-                        }
-                    },
-                    {
-                        name: 'kbaseNarrativeAppPanel',
-                        params: {
-                            autopopulate: false,
-                            collapseCallback: $.proxy(function(isMinimized) {
-                                this.handleMinimizedMethodPanel(isMinimized);
-                            }, this)
-                        }
+                    name: 'kbaseNarrativeDataPanel',
+                    params: {
+                        collapseCallback: $.proxy(function(isMinimized) {
+                            this.handleMinimizedDataPanel(isMinimized);
+                        }, this)
                     }
-                ]);
+                },
+                {
+                    name: 'kbaseNarrativeAppPanel',
+                    params: {
+                        autopopulate: false,
+                        collapseCallback: $.proxy(function(isMinimized) {
+                            this.handleMinimizedMethodPanel(isMinimized);
+                        }, this)
+                    }
+                }]);
                 this.$dataWidget = analysisWidgets['kbaseNarrativeDataPanel'];
                 this.$methodsWidget = analysisWidgets['kbaseNarrativeAppPanel'];
 
@@ -94,17 +93,16 @@ define(
                 var $jobsPanel = jobsWidget['panelSet'];
 
                 this.$tabs = this.buildTabs([{
-                        tabName: 'Analyze',
-                        content: $analysisPanel
-                    },
-                    {
-                        tabName: 'Narratives',
-                        content: $managePanel
-                    },
-                    // {
-                    //     tabName : this.$jobsWidget.title,
-                    //     content: $jobsPanel
-                    // }
+                    tabName: 'Analyze',
+                    content: $analysisPanel
+                }, {
+                    tabName: 'Narratives',
+                    content: $managePanel
+                },
+                // {
+                //     tabName : this.$jobsWidget.title,
+                //     content: $jobsPanel
+                // }
                 ], true);
 
                 this.$elem.addClass('kb-side-panel');
@@ -129,11 +127,8 @@ define(
 
                 if (this.autorender) {
                     this.render();
-                } else {
-
                 }
 
-
                 return this;
             },
 
@@ -404,11 +399,9 @@ define(
                 this.$jobsWidget.setHeight(fullSize);
             },
 
-
             render: function() {
                 this.initOverlay();
-                // this.$methodsWidget.refreshFromService();
             }
 
-        })
-    });
\ No newline at end of file
+        });
+    });
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
index d35334fb8a..07189be2c3 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
@@ -92,7 +92,6 @@ define([
         },
 
         updateView: function() {
-            console.log("UPDATING VIEW");
             return this.stagingServiceClient.list({path: this.subpath})
                 .then(function(data) {
                     var files = JSON.parse(data);
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js
index 1c9b565a1b..229acd724b 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/uploadTour.js
@@ -78,7 +78,6 @@ define([
         if (!useGlobus) {
             this.tour_steps.splice(2, 1);
         }
-        console.log("BUILDING NEW TOUR");
 
         this.tour = new Tour({
             storage: false, // start tour from beginning every time
diff --git a/package.json b/package.json
index 39d1abc7fd..e3a301e7e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kbase-narrative-core",
   "description": "Core components for the KBase Narrative Interface",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "private": true,
   "repository": "github.com/kbase/narrative",
   "devDependencies": {
diff --git a/src/biokbase/narrative/__init__.py b/src/biokbase/narrative/__init__.py
index e450b153d2..2824740383 100644
--- a/src/biokbase/narrative/__init__.py
+++ b/src/biokbase/narrative/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['magics', 'ws_util', 'common', 'handlers', 'contents', 'services', 'widgetmanager']
 
 from semantic_version import Version
-__version__ = Version("3.5.2")
+__version__ = Version("3.6.0")
 version = lambda: __version__
 
 # if run directly:
diff --git a/src/config.json b/src/config.json
index 60f9ffa2d6..0fa482fa52 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1,239 +1,239 @@
 {
     "appdev": {
-        "auth": "https://appdev.kbase.us/services/auth", 
-        "awe": "https://appdev.kbase.us/services/awe-api", 
-        "catalog": "https://appdev.kbase.us/services/catalog", 
-        "cdn": "https://appdev.kbase.us/cdn/files", 
-        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/", 
-        "data_import_export": "https://appdev.kbase.us/services/data_import_export", 
-        "data_panel_sources": "/data_source_config.json", 
-        "fba": "https://appdev.kbase.us/services/KBaseFBAModeling/", 
-        "feature_values": "https://appdev.kbase.us/services/feature_values/jsonrpc", 
-        "ftp_api_root": "/data/bulk", 
-        "ftp_api_url": "https://appdev.kbase.us/services/kb-ftp-api/v0", 
-        "gene_families": "https://appdev.kbase.us/services/gene_families", 
-        "genomeCmp": "https://appdev.kbase.us/services/genome_comparison/jsonrpc", 
-        "job_service": "https://appdev.kbase.us/services/njs_wrapper", 
-        "landing_pages": "/#dataview/", 
-        "log_proxy_host": "172.17.42.1", 
-        "log_proxy_port": 32001, 
-        "login": "https://appdev.kbase.us/services/authorization/Sessions/Login", 
-        "narrative_job_proxy": "https://appdev.kbase.us/services/narrativejobproxy/", 
-        "narrative_method_store": "https://appdev.kbase.us/services/narrative_method_store/rpc", 
-        "narrative_method_store_image": "https://appdev.kbase.us/services/narrative_method_store/", 
-        "narrative_method_store_types": "https://next.kbase.us/services/narrative_method_store/rpc", 
-        "profile_page": "/#people/", 
-        "protein_info": "", 
-        "reset_password": "https://gologin.kbase.us/ResetPassword", 
-        "search": "https://appdev.kbase.us/services/search/getResults", 
-        "service_wizard": "https://appdev.kbase.us/services/service_wizard", 
-        "shock": "https://appdev.kbase.us/services/shock-api", 
-        "staging_api_url": "https://appdev.kbase.us/services/staging_service", 
-        "status_page": "http://kbase.us/internal/status/", 
-        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version", 
-        "transform": "https://appdev.kbase.us/services/transform", 
-        "trees": "https://appdev.kbase.us/services/trees", 
-        "ui_common_root": "https://appdev.kbase.us/", 
-        "update_profile": "https://gologin.kbase.us/account/UpdateProfile", 
-        "uploader": "", 
-        "user_and_job_state": "https://appdev.kbase.us/services/userandjobstate", 
-        "user_profile": "https://appdev.kbase.us/services/user_profile/rpc", 
-        "version_check": "/narrative_version", 
-        "workspace": "https://appdev.kbase.us/services/ws", 
+        "auth": "https://appdev.kbase.us/services/auth",
+        "awe": "https://appdev.kbase.us/services/awe-api",
+        "catalog": "https://appdev.kbase.us/services/catalog",
+        "cdn": "https://appdev.kbase.us/cdn/files",
+        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
+        "data_import_export": "https://appdev.kbase.us/services/data_import_export",
+        "data_panel_sources": "/data_source_config.json",
+        "fba": "https://appdev.kbase.us/services/KBaseFBAModeling/",
+        "feature_values": "https://appdev.kbase.us/services/feature_values/jsonrpc",
+        "ftp_api_root": "/data/bulk",
+        "ftp_api_url": "https://appdev.kbase.us/services/kb-ftp-api/v0",
+        "gene_families": "https://appdev.kbase.us/services/gene_families",
+        "genomeCmp": "https://appdev.kbase.us/services/genome_comparison/jsonrpc",
+        "job_service": "https://appdev.kbase.us/services/njs_wrapper",
+        "landing_pages": "/#dataview/",
+        "log_proxy_host": "172.17.42.1",
+        "log_proxy_port": 32001,
+        "login": "https://appdev.kbase.us/services/authorization/Sessions/Login",
+        "narrative_job_proxy": "https://appdev.kbase.us/services/narrativejobproxy/",
+        "narrative_method_store": "https://appdev.kbase.us/services/narrative_method_store/rpc",
+        "narrative_method_store_image": "https://appdev.kbase.us/services/narrative_method_store/",
+        "narrative_method_store_types": "https://next.kbase.us/services/narrative_method_store/rpc",
+        "profile_page": "/#people/",
+        "protein_info": "",
+        "reset_password": "https://gologin.kbase.us/ResetPassword",
+        "search": "https://appdev.kbase.us/services/search/getResults",
+        "service_wizard": "https://appdev.kbase.us/services/service_wizard",
+        "shock": "https://appdev.kbase.us/services/shock-api",
+        "staging_api_url": "https://appdev.kbase.us/services/staging_service",
+        "status_page": "http://kbase.us/internal/status/",
+        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version",
+        "transform": "https://appdev.kbase.us/services/transform",
+        "trees": "https://appdev.kbase.us/services/trees",
+        "ui_common_root": "https://appdev.kbase.us/",
+        "update_profile": "https://gologin.kbase.us/account/UpdateProfile",
+        "uploader": "",
+        "user_and_job_state": "https://appdev.kbase.us/services/userandjobstate",
+        "user_profile": "https://appdev.kbase.us/services/user_profile/rpc",
+        "version_check": "/narrative_version",
+        "workspace": "https://appdev.kbase.us/services/ws",
         "ws_browser": "https://appdev.kbase.us/#ws"
-    }, 
-    "auth_cookie": "kbase_session", 
-    "auth_sleep_recheck_ms": 60000, 
+    },
+    "auth_cookie": "kbase_session",
+    "auth_sleep_recheck_ms": 60000,
     "ci": {
-        "auth": "https://ci.kbase.us/services/auth", 
-        "awe": "https://ci.kbase.us/services/awe-api", 
-        "catalog": "https://ci.kbase.us/services/catalog", 
-        "cdn": "https://ci.kbase.us/cdn/files", 
-        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/", 
-        "data_import_export": "https://ci.kbase.us/services/data_import_export", 
-        "data_panel_sources": "/data_source_config.json", 
-        "fba": "https://ci.kbase.us/services/KBaseFBAModeling/", 
-        "feature_values": "https://ci.kbase.us/services/feature_values/jsonrpc", 
-        "ftp_api_root": "/data/bulk", 
-        "ftp_api_url": "https://ci.kbase.us/services/kb-ftp-api/v0", 
-        "gene_families": "https://ci.kbase.us/services/gene_families", 
-        "genomeCmp": "https://ci.kbase.us/services/genome_comparison/jsonrpc", 
-        "invocation": "", 
-        "job_service": "https://ci.kbase.us/services/njs_wrapper", 
-        "landing_pages": "/#dataview/", 
-        "log_proxy_host": "172.17.0.1", 
-        "log_proxy_port": 32001, 
-        "login": "https://ci.kbase.us/services/authorization/Sessions/Login", 
-        "narrative_method_store": "https://ci.kbase.us/services/narrative_method_store/rpc", 
-        "narrative_method_store_image": "https://ci.kbase.us/services/narrative_method_store/", 
-        "profile_page": "/#people/", 
-        "protein_info": "", 
-        "reset_password": "https://gologin.kbase.us/ResetPassword", 
-        "search": "https://ci.kbase.us/services/search/getResults", 
-        "service_wizard": "https://ci.kbase.us/services/service_wizard", 
-        "shock": "https://ci.kbase.us/services/shock-api", 
-        "staging_api_url": "https://ci.kbase.us/services/staging_service", 
-        "status_page": "http://kbase.us/internal/status/", 
-        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version", 
-        "transform": "https://ci.kbase.us/services/transform", 
-        "trees": "https://ci.kbase.us/services/trees", 
-        "ui_common_root": "https://narrative-ci.kbase.us/", 
-        "update_profile": "https://gologin.kbase.us/account/UpdateProfile", 
-        "uploader": "", 
-        "user_and_job_state": "https://ci.kbase.us/services/userandjobstate", 
-        "user_profile": "https://ci.kbase.us/services/user_profile/rpc", 
-        "version_check": "/narrative_version", 
-        "workspace": "https://ci.kbase.us/services/ws", 
+        "auth": "https://ci.kbase.us/services/auth",
+        "awe": "https://ci.kbase.us/services/awe-api",
+        "catalog": "https://ci.kbase.us/services/catalog",
+        "cdn": "https://ci.kbase.us/cdn/files",
+        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
+        "data_import_export": "https://ci.kbase.us/services/data_import_export",
+        "data_panel_sources": "/data_source_config.json",
+        "fba": "https://ci.kbase.us/services/KBaseFBAModeling/",
+        "feature_values": "https://ci.kbase.us/services/feature_values/jsonrpc",
+        "ftp_api_root": "/data/bulk",
+        "ftp_api_url": "https://ci.kbase.us/services/kb-ftp-api/v0",
+        "gene_families": "https://ci.kbase.us/services/gene_families",
+        "genomeCmp": "https://ci.kbase.us/services/genome_comparison/jsonrpc",
+        "invocation": "",
+        "job_service": "https://ci.kbase.us/services/njs_wrapper",
+        "landing_pages": "/#dataview/",
+        "log_proxy_host": "172.17.0.1",
+        "log_proxy_port": 32001,
+        "login": "https://ci.kbase.us/services/authorization/Sessions/Login",
+        "narrative_method_store": "https://ci.kbase.us/services/narrative_method_store/rpc",
+        "narrative_method_store_image": "https://ci.kbase.us/services/narrative_method_store/",
+        "profile_page": "/#people/",
+        "protein_info": "",
+        "reset_password": "https://gologin.kbase.us/ResetPassword",
+        "search": "https://ci.kbase.us/services/search/getResults",
+        "service_wizard": "https://ci.kbase.us/services/service_wizard",
+        "shock": "https://ci.kbase.us/services/shock-api",
+        "staging_api_url": "https://ci.kbase.us/services/staging_service",
+        "status_page": "http://kbase.us/internal/status/",
+        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version",
+        "transform": "https://ci.kbase.us/services/transform",
+        "trees": "https://ci.kbase.us/services/trees",
+        "ui_common_root": "https://narrative-ci.kbase.us/",
+        "update_profile": "https://gologin.kbase.us/account/UpdateProfile",
+        "uploader": "",
+        "user_and_job_state": "https://ci.kbase.us/services/userandjobstate",
+        "user_profile": "https://ci.kbase.us/services/user_profile/rpc",
+        "version_check": "/narrative_version",
+        "workspace": "https://ci.kbase.us/services/ws",
         "ws_browser": "https://narrative.kbase.us/#ws"
-    }, 
-    "comm_wait_timeout": 600000, 
-    "config": "ci", 
+    },
+    "comm_wait_timeout": 600000,
+    "config": "ci",
     "data_panel": {
-        "initial_sort_limit": 10000, 
-        "max_name_length": 33, 
-        "max_single_request": 1000, 
-        "obj_render_initial": 40, 
-        "obj_render_scroll": 5, 
-        "refresh_interval_ms": 30000, 
-        "typeahead_search_limit": 20000, 
-        "ws_chunk_size": 10000, 
+        "initial_sort_limit": 10000,
+        "max_name_length": 33,
+        "max_single_request": 1000,
+        "obj_render_initial": 40,
+        "obj_render_scroll": 5,
+        "refresh_interval_ms": 30000,
+        "typeahead_search_limit": 20000,
+        "ws_chunk_size": 10000,
         "ws_max_objs_to_fetch": 30000
-    }, 
+    },
     "dev": {
-        "awe": "http://140.221.67.185:7080", 
-        "catalog": "https://ci.kbase.us/services/catalog", 
-        "cdmi": "https://kbase.us/services/cdmi_api/", 
-        "cdn": "https://ci.kbase.us/cdn/files", 
-        "data_import_export": "https://kbase.us/services/data_import_export", 
-        "data_panel_sources": "/data_source_config.json", 
-        "fba": "https://kbase.us/services/KBaseFBAModeling/", 
-        "feature_values": "https://ci.kbase.us/services/feature_values/jsonrpc", 
-        "gene_families": "http://140.221.67.203:8123/", 
-        "genomeCmp": "http://dev06.berkeley.kbase.us:8283/jsonrpc", 
-        "glamm": "http://140.221.84.217:7040/glamm/#", 
-        "invocation": "https://kbase.us/services/invocation", 
-        "job_service": "http://dev06.berkeley.kbase.us:8200", 
-        "landing_pages": "http://narrative.kbase.us/#", 
-        "log_proxy_host": "172.17.42.1", 
-        "log_proxy_port": 32001, 
-        "login": "https://kbase.us/services/authorization/Sessions/Login", 
-        "narrative_job_proxy": "http://140.221.67.225:8088", 
-        "narrative_method_store": "http://dev19.berkeley.kbase.us/narrative_method_store/rpc", 
-        "narrative_method_store_image": "https://dev19.berkeley.kbase.us/services/narrative_method_store/", 
-        "profile_page": "/#people/", 
-        "protein_info": "https://kbase.us/services/protein_info_service", 
-        "reset_password": "https://gologin.kbase.us/ResetPassword", 
-        "search": "https://kbase.us/services/search/getResults", 
-        "service_wizard": "https://ci.kbase.us/services/service_wizard", 
-        "shock": "https://kbase.us/services/shock-api", 
-        "status_page": "http://kbase.us/internal/status/", 
-        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1", 
-        "transform": "https://kbase.us/services/transform", 
-        "trees": "http://140.221.67.152:7047", 
-        "ui_common_root": "https://narrative-dev.kbase.us/", 
-        "update_profile": "https://gologin.kbase.us/account/UpdateProfile", 
-        "uploader": "http://kbase.us/services/docs/uploader/uploader.html", 
-        "user_and_job_state": "http://kbase.us/services/userandjobstate", 
-        "user_profile": "http://dev19.berkeley.kbase.us/services/user_profile/rpc", 
-        "workspace": "http://dev04.berkeley.kbase.us:7058", 
+        "awe": "http://140.221.67.185:7080",
+        "catalog": "https://ci.kbase.us/services/catalog",
+        "cdmi": "https://kbase.us/services/cdmi_api/",
+        "cdn": "https://ci.kbase.us/cdn/files",
+        "data_import_export": "https://kbase.us/services/data_import_export",
+        "data_panel_sources": "/data_source_config.json",
+        "fba": "https://kbase.us/services/KBaseFBAModeling/",
+        "feature_values": "https://ci.kbase.us/services/feature_values/jsonrpc",
+        "gene_families": "http://140.221.67.203:8123/",
+        "genomeCmp": "http://dev06.berkeley.kbase.us:8283/jsonrpc",
+        "glamm": "http://140.221.84.217:7040/glamm/#",
+        "invocation": "https://kbase.us/services/invocation",
+        "job_service": "http://dev06.berkeley.kbase.us:8200",
+        "landing_pages": "http://narrative.kbase.us/#",
+        "log_proxy_host": "172.17.42.1",
+        "log_proxy_port": 32001,
+        "login": "https://kbase.us/services/authorization/Sessions/Login",
+        "narrative_job_proxy": "http://140.221.67.225:8088",
+        "narrative_method_store": "http://dev19.berkeley.kbase.us/narrative_method_store/rpc",
+        "narrative_method_store_image": "https://dev19.berkeley.kbase.us/services/narrative_method_store/",
+        "profile_page": "/#people/",
+        "protein_info": "https://kbase.us/services/protein_info_service",
+        "reset_password": "https://gologin.kbase.us/ResetPassword",
+        "search": "https://kbase.us/services/search/getResults",
+        "service_wizard": "https://ci.kbase.us/services/service_wizard",
+        "shock": "https://kbase.us/services/shock-api",
+        "status_page": "http://kbase.us/internal/status/",
+        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1",
+        "transform": "https://kbase.us/services/transform",
+        "trees": "http://140.221.67.152:7047",
+        "ui_common_root": "https://narrative-dev.kbase.us/",
+        "update_profile": "https://gologin.kbase.us/account/UpdateProfile",
+        "uploader": "http://kbase.us/services/docs/uploader/uploader.html",
+        "user_and_job_state": "http://kbase.us/services/userandjobstate",
+        "user_profile": "http://dev19.berkeley.kbase.us/services/user_profile/rpc",
+        "workspace": "http://dev04.berkeley.kbase.us:7058",
         "ws_browser": "http://narrative.kbase.us/#ws"
-    }, 
-    "dev_mode": true, 
-    "git_commit_hash": "8928919d6", 
-    "git_commit_time": "Tue Jan 9 11:48:43 2018 -0800", 
-    "loading_gif": "/narrative/static/kbase/images/ajax-loader.gif", 
-    "name": "KBase Narrative", 
+    },
+    "dev_mode": true,
+    "git_commit_hash": "8928919d6",
+    "git_commit_time": "Tue Jan 9 11:48:43 2018 -0800",
+    "loading_gif": "/narrative/static/kbase/images/ajax-loader.gif",
+    "name": "KBase Narrative",
     "next": {
-        "auth": "https://next.kbase.us/services/auth", 
-        "awe": "https://next.kbase.us/services/awe-api", 
-        "catalog": "https://next.kbase.us/services/catalog", 
-        "cdn": "https://next.kbase.us/cdn/files", 
-        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/", 
-        "data_import_export": "https://next.kbase.us/services/data_import_export", 
-        "data_panel_sources": "/data_source_config.json", 
-        "fba": "https://next.kbase.us/services/KBaseFBAModeling/", 
-        "feature_values": "https://next.kbase.us/services/feature_values/jsonrpc", 
-        "ftp_api_root": "/data/bulk", 
-        "ftp_api_url": "https://next.kbase.us/services/kb-ftp-api/v0", 
-        "gene_families": "https://next.kbase.us/services/gene_families", 
-        "genomeCmp": "https://next.kbase.us/services/genome_comparison/jsonrpc", 
-        "invocation": "", 
-        "job_service": "https://next.kbase.us/services/njs_wrapper", 
-        "landing_pages": "/#dataview/", 
-        "log_proxy_host": "172.17.42.1", 
-        "log_proxy_port": 32001, 
-        "login": "https://next.kbase.us/services/authorization/Sessions/Login", 
-        "narrative_job_proxy": "http://narrative-next.kbase.us:7068", 
-        "narrative_method_store": "https://next.kbase.us/services/narrative_method_store/rpc", 
-        "narrative_method_store_image": "https://next.kbase.us/services/narrative_method_store/", 
-        "profile_page": "/#people/", 
-        "protein_info": "", 
-        "reset_password": "https://gologin.kbase.us/ResetPassword", 
-        "search": "https://kbase.us/services/search/getResults", 
-        "service_wizard": "https://next.kbase.us/services/service_wizard", 
-        "shock": "https://next.kbase.us/services/shock-api", 
-        "staging_api_url": "https://next.kbase.us/services/staging_service", 
-        "status_page": "http://kbase.us/internal/status/", 
-        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version", 
-        "transform": "https://next.kbase.us/services/transform", 
-        "trees": "https://next.kbase.us/services/trees", 
-        "ui_common_root": "https://narrative-next.kbase.us/", 
-        "update_profile": "https://gologin.kbase.us/account/UpdateProfile", 
-        "uploader": "", 
-        "user_and_job_state": "https://next.kbase.us/services/userandjobstate", 
-        "user_profile": "https://next.kbase.us/services/user_profile/rpc", 
-        "version_check": "/narrative_version", 
-        "workspace": "https://next.kbase.us/services/ws", 
+        "auth": "https://next.kbase.us/services/auth",
+        "awe": "https://next.kbase.us/services/awe-api",
+        "catalog": "https://next.kbase.us/services/catalog",
+        "cdn": "https://next.kbase.us/cdn/files",
+        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
+        "data_import_export": "https://next.kbase.us/services/data_import_export",
+        "data_panel_sources": "/data_source_config.json",
+        "fba": "https://next.kbase.us/services/KBaseFBAModeling/",
+        "feature_values": "https://next.kbase.us/services/feature_values/jsonrpc",
+        "ftp_api_root": "/data/bulk",
+        "ftp_api_url": "https://next.kbase.us/services/kb-ftp-api/v0",
+        "gene_families": "https://next.kbase.us/services/gene_families",
+        "genomeCmp": "https://next.kbase.us/services/genome_comparison/jsonrpc",
+        "invocation": "",
+        "job_service": "https://next.kbase.us/services/njs_wrapper",
+        "landing_pages": "/#dataview/",
+        "log_proxy_host": "172.17.42.1",
+        "log_proxy_port": 32001,
+        "login": "https://next.kbase.us/services/authorization/Sessions/Login",
+        "narrative_job_proxy": "http://narrative-next.kbase.us:7068",
+        "narrative_method_store": "https://next.kbase.us/services/narrative_method_store/rpc",
+        "narrative_method_store_image": "https://next.kbase.us/services/narrative_method_store/",
+        "profile_page": "/#people/",
+        "protein_info": "",
+        "reset_password": "https://gologin.kbase.us/ResetPassword",
+        "search": "https://kbase.us/services/search/getResults",
+        "service_wizard": "https://next.kbase.us/services/service_wizard",
+        "shock": "https://next.kbase.us/services/shock-api",
+        "staging_api_url": "https://next.kbase.us/services/staging_service",
+        "status_page": "http://kbase.us/internal/status/",
+        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version",
+        "transform": "https://next.kbase.us/services/transform",
+        "trees": "https://next.kbase.us/services/trees",
+        "ui_common_root": "https://narrative-next.kbase.us/",
+        "update_profile": "https://gologin.kbase.us/account/UpdateProfile",
+        "uploader": "",
+        "user_and_job_state": "https://next.kbase.us/services/userandjobstate",
+        "user_profile": "https://next.kbase.us/services/user_profile/rpc",
+        "version_check": "/narrative_version",
+        "workspace": "https://next.kbase.us/services/ws",
         "ws_browser": "https://narrative.kbase.us/#ws"
-    }, 
+    },
     "prod": {
-        "auth": "https://kbase.us/services/auth", 
-        "awe": "https://kbase.us/services/awe-api", 
-        "catalog": "https://kbase.us/services/catalog", 
-        "cdn": "https://kbase.us/cdn/files", 
-        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/", 
-        "data_import_export": "https://kbase.us/services/data_import_export", 
-        "data_panel_sources": "/data_source_config.json", 
-        "fba": "https://kbase.us/services/KBaseFBAModeling/", 
-        "feature_values": "https://kbase.us/services/feature_values/jsonrpc", 
-        "ftp_api_root": "/data/bulk", 
-        "ftp_api_url": "https://kbase.us/services/kb-ftp-api/v0", 
-        "gene_families": "https://kbase.us/services/gene_families", 
-        "genomeCmp": "https://kbase.us/services/genome_comparison/jsonrpc", 
-        "invocation": "https://kbase.us/services/invocation", 
-        "job_service": "https://kbase.us/services/njs_wrapper", 
-        "landing_pages": "/#dataview/", 
-        "log_proxy_host": "172.17.42.1", 
-        "log_proxy_port": 32001, 
-        "login": "https://kbase.us/services/authorization/Sessions/Login", 
-        "narrative_job_proxy": "http://narrative.kbase.us:7068", 
-        "narrative_method_store": "https://kbase.us/services/narrative_method_store/rpc", 
-        "narrative_method_store_image": "https://kbase.us/services/narrative_method_store/", 
-        "profile_page": "/#people/", 
-        "protein_info": "https://kbase.us/services/protein_info_service", 
-        "reset_password": "https://gologin.kbase.us/ResetPassword", 
-        "search": "https://kbase.us/services/search/getResults", 
-        "service_wizard": "https://kbase.us/services/service_wizard", 
-        "shock": "https://kbase.us/services/shock-api", 
-        "staging_api_url": "https://kbase.us/services/staging_service", 
-        "status_page": "http://kbase.us/internal/status/", 
-        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version", 
-        "transform": "https://kbase.us/services/transform", 
-        "trees": "https://kbase.us/services/trees", 
-        "ui_common_root": "https://narrative.kbase.us/", 
-        "update_profile": "https://gologin.kbase.us/account/UpdateProfile", 
-        "uploader": "http://kbase.us/services/docs/uploader/uploader.html", 
-        "user_and_job_state": "https://kbase.us/services/userandjobstate", 
-        "user_profile": "https://kbase.us/services/user_profile/rpc", 
-        "version_check": "/narrative_version", 
-        "workspace": "https://kbase.us/services/ws", 
+        "auth": "https://kbase.us/services/auth",
+        "awe": "https://kbase.us/services/awe-api",
+        "catalog": "https://kbase.us/services/catalog",
+        "cdn": "https://kbase.us/cdn/files",
+        "compound_img_url": "http://minedatabase.mcs.anl.gov/compound_images/ModelSEED/",
+        "data_import_export": "https://kbase.us/services/data_import_export",
+        "data_panel_sources": "/data_source_config.json",
+        "fba": "https://kbase.us/services/KBaseFBAModeling/",
+        "feature_values": "https://kbase.us/services/feature_values/jsonrpc",
+        "ftp_api_root": "/data/bulk",
+        "ftp_api_url": "https://kbase.us/services/kb-ftp-api/v0",
+        "gene_families": "https://kbase.us/services/gene_families",
+        "genomeCmp": "https://kbase.us/services/genome_comparison/jsonrpc",
+        "invocation": "https://kbase.us/services/invocation",
+        "job_service": "https://kbase.us/services/njs_wrapper",
+        "landing_pages": "/#dataview/",
+        "log_proxy_host": "172.17.42.1",
+        "log_proxy_port": 32001,
+        "login": "https://kbase.us/services/authorization/Sessions/Login",
+        "narrative_job_proxy": "http://narrative.kbase.us:7068",
+        "narrative_method_store": "https://kbase.us/services/narrative_method_store/rpc",
+        "narrative_method_store_image": "https://kbase.us/services/narrative_method_store/",
+        "profile_page": "/#people/",
+        "protein_info": "https://kbase.us/services/protein_info_service",
+        "reset_password": "https://gologin.kbase.us/ResetPassword",
+        "search": "https://kbase.us/services/search/getResults",
+        "service_wizard": "https://kbase.us/services/service_wizard",
+        "shock": "https://kbase.us/services/shock-api",
+        "staging_api_url": "https://kbase.us/services/staging_service",
+        "status_page": "http://kbase.us/internal/status/",
+        "submit_jira_ticket": "https://atlassian.kbase.us/secure/CreateIssueDetails!init.jspa?pid=10200&issuetype=1&description=Narrative%20version",
+        "transform": "https://kbase.us/services/transform",
+        "trees": "https://kbase.us/services/trees",
+        "ui_common_root": "https://narrative.kbase.us/",
+        "update_profile": "https://gologin.kbase.us/account/UpdateProfile",
+        "uploader": "http://kbase.us/services/docs/uploader/uploader.html",
+        "user_and_job_state": "https://kbase.us/services/userandjobstate",
+        "user_profile": "https://kbase.us/services/user_profile/rpc",
+        "version_check": "/narrative_version",
+        "workspace": "https://kbase.us/services/ws",
         "ws_browser": "https://narrative.kbase.us/#ws"
-    }, 
-    "release_notes": "https://github.com/kbase/narrative/blob/master/RELEASE_NOTES.md", 
+    },
+    "release_notes": "https://github.com/kbase/narrative/blob/master/RELEASE_NOTES.md",
     "tooltip": {
-        "hideDelay": 0, 
+        "hideDelay": 0,
         "showDelay": 750
-    }, 
-    "use_local_widgets": true, 
-    "version": "3.5.2"
-}
\ No newline at end of file
+    },
+    "use_local_widgets": true,
+    "version": "3.6.0"
+}