diff --git a/CHANGELOG.md b/CHANGELOG.md
index f96b1695bf..cc9ec4c9bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. As our fork has diverged from AWS SWB mainline branch, we are noting the SWB version and the lab version together, as <swb version>\_<lab version>, starting from SWB mainline, 5.0.0.
 
+## [5.0.0_1.1.2](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.1.1...v5.0.0_1.1.2) (08/10/2023)
+
+- Fix bug introduced in 5.0.0_1.1.0 where create workspace button does not display if user does not have any exisitng workspaces.
+- Remove inline python libraries from infrastructure proxy lambda handler.
+- Update to use newer python version for proy handler.
+- Update to build proxy lambda layer and with requirements.
+
 ## [5.0.0_1.1.1](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.1.0...v5.0.0_1.1.1) (08/10/2023)
 - Update serverless templates to use an empty string for aws profile.
 - Update nodejs and aws-sdk versions.
@@ -11,6 +18,7 @@ All notable changes to this project will be documented in this file. As our fork
   - Cherry pick [3e9d28ac355acff1909ebf6e6de39c22fda7e6b0](https://github.com/awslabs/service-workbench-on-aws/commit/3e9d28ac355acff1909ebf6e6de39c22fda7e6b0)
 
 ## [5.0.0_1.1.0](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.0.3...v5.0.0_1.1.0) (07/21/2023)
+
 - Add S3 GetObject and List permission to access embed data for workspaces.
 - Add logos to workspace types on user creation step so it's easier to visually find the types they want.
 - Add new notice on revoked workspace types, but continue to load the env detail card to allow users to start/stop/terminate revoked workspace types. (Does not give users access to make new workspaces based on the revoked type, only allows them to access already launched ones.)
diff --git a/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/ScEnvironmentsList.js b/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/ScEnvironmentsList.js
index ef01784d43..5262588919 100644
--- a/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/ScEnvironmentsList.js
+++ b/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/ScEnvironmentsList.js
@@ -135,6 +135,8 @@ class ScEnvironmentsList extends React.Component {
     const store = this.envsStore;
     let content = null;
     let list = [];
+    let total = 0;
+
     const projects = this.getProjects();
     const appStreamProjectIds = _.map(
       _.filter(projects, proj => proj.isAppStreamConfigured),
@@ -153,24 +155,21 @@ class ScEnvironmentsList extends React.Component {
       content = this.renderEmpty();
     } else if (isStoreNotEmpty(store)) {
       list = this.searchAndFilter();
-      content = (
-        <>
-          <EnvsHeader
-            current={list.length}
-            total={store.total}
-            isAdmin={this.isAdmin}
-            provisionDisabled={this.provisionDisabled}
-            onViewToggle={this.handleViewToggle()}
-            onEnvCreate={this.handleCreateEnvironment}
-          />
-          {this.renderMain(list)}
-        </>
-      );
+      content = this.renderMain(list);
+      total = store.total;
     }
 
     return (
       <Container className="mt3 animated fadeIn">
         {this.provisionDisabled && this.renderMissingAppStreamConfig()}
+        <EnvsHeader
+          current={list.length}
+          total={total}
+          isAdmin={this.isAdmin}
+          provisionDisabled={this.provisionDisabled}
+          onViewToggle={this.handleViewToggle()}
+          onEnvCreate={this.handleCreateEnvironment}
+        />
         {content}
       </Container>
     );
diff --git a/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/advanced/ScEnvAdvancedList.js b/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/advanced/ScEnvAdvancedList.js
index 70adacce1f..d9cb43cf26 100644
--- a/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/advanced/ScEnvAdvancedList.js
+++ b/addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/environments-sc/advanced/ScEnvAdvancedList.js
@@ -193,6 +193,8 @@ class ScEnvAdvancedList extends React.Component {
 
   render() {
     let content = null;
+    let list = [];
+    let total = 0;
 
     if (isStoreError(this.envsStore)) {
       content = <ErrorBox error={this.envsStore.error} className="p0" />;
@@ -211,30 +213,40 @@ class ScEnvAdvancedList extends React.Component {
     } else if (isStoreNotEmpty(this.envsStore)) {
       const fields = this.getEnvFields(this.envsStore.list);
       const tableColumns = fields.map(column => _.pick(column, ['key', 'label', 'sortable', 'type']));
-      const tableRows = this.getEnvs(this.envsStore.list, this.viewStore.filters, this.viewStore.sort);
+      list = this.getEnvs(this.envsStore.list, this.viewStore.filters, this.viewStore.sort);
+      total = this.envsStore.total;
 
       content = (
         <>
-          <EnvsHeader
-            current={tableRows.length}
-            total={this.envsStore.total}
-            view={this.viewStore.view}
-            isAdmin // We only get to this view if we're an admin, so this must be true
-            onViewToggle={this.handleViewToggle()}
-            onEnvCreate={this.handleCreateEnvironment()}
-          />
           <FilterBox
             mode={this.viewStore.mode}
             filters={this.viewStore.filters}
             fields={fields}
             onFilter={this.handleFilter()}
           />
-          <CompactTable sort={this.viewStore.sort} columns={tableColumns} rows={tableRows} onSort={this.handleSort()} />
+          <CompactTable
+            sort={this.viewStore.sort}
+            columns={tableColumns}
+            rows={list}
+            onSort={this.handleSort()}
+          />
         </>
       );
     }
 
-    return <Container className="mt3 animated fadeIn">{content}</Container>;
+    return (
+      <Container className="mt3 animated fadeIn">
+        <EnvsHeader
+          current={list.length}
+          total={total}
+          view={this.viewStore.view}
+          isAdmin // We only get to this view if we're an admin, so this must be true
+          onViewToggle={this.handleViewToggle()}
+          onEnvCreate={this.handleCreateEnvironment()}
+        />
+        {content}
+      </Container>
+    );
   }
 }