diff --git a/package.json b/package.json
index 951a0d77d..c3ef90f3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "harperdb-studio",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "A UI for HarperDB",
   "deploymentUrl": "studio.harperdb.io",
   "private": true,
diff --git a/src/components/instance/functions/manage/index.js b/src/components/instance/functions/manage/index.js
index f36c4b0d8..2d5715f4b 100644
--- a/src/components/instance/functions/manage/index.js
+++ b/src/components/instance/functions/manage/index.js
@@ -480,26 +480,24 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
 
   async function revertFileChanges(selectedFile) {
 
-    // ditch local storage version
+    // unset local storage version
     removeFileFromLocalStorage({ path: selectedFile.path });
 
-    // get file
-    //
-    const { error, message} = await getComponentFile({
+    // get canonical file version
+    const { error, message } = await getComponentFile({
       auth,
       url,
       project: selectedFile.project,
       file: getRelativeFilepath(selectedFile.path)
     });
 
-    removeFileFromLocalStorage({ path: selectedFile.path });
-
     if (error) {
       return alert.error(message);
     }
 
     await refreshCustomFunctions();
 
+    // return canonical file content to caller
     return message;
 
   }
diff --git a/src/components/instances/list/NewInstanceCard.js b/src/components/instances/list/NewInstanceCard.js
index bf303acdd..629420613 100644
--- a/src/components/instances/list/NewInstanceCard.js
+++ b/src/components/instances/list/NewInstanceCard.js
@@ -22,7 +22,7 @@ function NewInstanceCard() {
           <div className="my-4">
             <i className="fa fa-2x fa-plus-circle new-instance-plus" />
           </div>
-          <span>Register User-Installed Instance</span>
+          <span>Register Enterprise Instance</span>
         </CardBody>
       </Card>
     </Col>
diff --git a/src/components/instances/new/TypeAWS.js b/src/components/instances/new/TypeAWS.js
index 43808ebc0..a1989dc96 100644
--- a/src/components/instances/new/TypeAWS.js
+++ b/src/components/instances/new/TypeAWS.js
@@ -1,14 +1,17 @@
 import React from 'react';
 import { Row, Col, Card, CardBody, Button } from 'reactstrap';
+import { useStoreState } from 'pullstate';
 import AWSLogo from '../../shared/logos/AWSLogo';
+import appState from '../../../functions/state/appState';
 
 function TypeAWS({ setFormData }) {
+  const theme = useStoreState(appState, (s) => s.theme);
   return (
     <Card className="mb-3">
       <CardBody className="instance-form-card-body">
         <Row>
           <Col xs="8" className="logo-header">
-            <AWSLogo />
+            <AWSLogo theme={theme} />
           </Col>
           <Col xs="4">
             <Button
diff --git a/src/components/instances/new/TypeVerizon.js b/src/components/instances/new/TypeVerizon.js
index 6e6a02c1a..006cad5b0 100644
--- a/src/components/instances/new/TypeVerizon.js
+++ b/src/components/instances/new/TypeVerizon.js
@@ -1,14 +1,17 @@
 import React from 'react';
 import { Row, Col, Card, CardBody, Button } from 'reactstrap';
+import { useStoreState } from 'pullstate';
 import VerizonLogo from '../../shared/logos/VerizonLogo';
+import appState from '../../../functions/state/appState';
 
 function TypeVerizon({ setFormData }) {
+  const theme = useStoreState(appState, (s) => s.theme);
   return (
     <Card className="mb-3">
       <CardBody className="instance-form-card-body">
         <Row>
           <Col xs="8" className="logo-header">
-            <VerizonLogo />
+            <VerizonLogo theme={theme} />
           </Col>
           <Col xs="4">
             <Button
diff --git a/src/components/shared/logos/AWSLogo.js b/src/components/shared/logos/AWSLogo.js
index 17298a378..123aa6e0b 100644
--- a/src/components/shared/logos/AWSLogo.js
+++ b/src/components/shared/logos/AWSLogo.js
@@ -1,7 +1,20 @@
 import React from 'react';
 
-function AWSLogo({ height = 25 }) {
-  return (
+function AWSLogo({ height = 25, theme = 'dark' }) {
+  return theme === 'dark' ? (
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.9 306.4" height={height}>
+      <path
+        d="M144.3,111.5a51.73,51.73,0,0,0,1.9,15.2,119.35,119.35,0,0,0,5.4,12.3,7,7,0,0,1,1.2,3.9c0,1.7-1,3.4-3.2,5.1l-10.7,7.2a8.28,8.28,0,0,1-4.4,1.5,8,8,0,0,1-5.1-2.4,54.73,54.73,0,0,1-6.1-8c-1.7-2.9-3.4-6.1-5.3-10q-19.95,23.55-50.1,23.5c-14.3,0-25.7-4.1-34.1-12.3s-12.6-19.1-12.6-32.7c0-14.5,5.1-26.2,15.5-35.1S60.9,66.4,78.4,66.4a129.15,129.15,0,0,1,18.1,1.4c6.3.9,12.8,2.2,19.6,3.7V59.1c0-12.9-2.7-22-8-27.2s-14.6-7.8-27.8-7.8a79,79,0,0,0-18.4,2.2,131,131,0,0,0-18.4,5.8,39.81,39.81,0,0,1-6,2.2,12.09,12.09,0,0,1-2.7.5c-2.4,0-3.6-1.7-3.6-5.3V21.2c0-2.7.3-4.8,1.2-6a13.21,13.21,0,0,1,4.8-3.6A99.24,99.24,0,0,1,58.7,3.9,103.71,103.71,0,0,1,85.3.7c20.3,0,35.1,4.6,44.6,13.8S144,37.7,144,56.4v55.2h.3ZM75.2,137.4a53.46,53.46,0,0,0,17.5-3.1,37.9,37.9,0,0,0,16.2-10.9,26.78,26.78,0,0,0,5.8-10.9,62.13,62.13,0,0,0,1.7-14.8V90.5a141.49,141.49,0,0,0-15.7-2.9,123.85,123.85,0,0,0-16-1c-11.4,0-19.8,2.2-25.4,6.8S51,104.5,51,113c0,8,2,14,6.3,18.1C61.4,135.3,67.3,137.4,75.2,137.4Zm136.7,18.4c-3.1,0-5.1-.5-6.5-1.7-1.4-1-2.6-3.4-3.6-6.6l-40-131.6a30.18,30.18,0,0,1-1.5-6.8c0-2.7,1.4-4.3,4.1-4.3h16.7c3.2,0,5.4.5,6.6,1.7,1.4,1,2.4,3.4,3.4,6.6l28.6,112.7L246.3,13.1c.9-3.4,1.9-5.6,3.2-6.6a11.85,11.85,0,0,1,6.8-1.7H270c3.2,0,5.4.5,6.8,1.7,1.4,1,2.6,3.4,3.2,6.6l26.9,114.1L336.4,13.1c1-3.4,2.2-5.6,3.4-6.6a11.36,11.36,0,0,1,6.6-1.7h15.8c2.7,0,4.3,1.4,4.3,4.3,0,.9-.2,1.7-.3,2.7a27,27,0,0,1-1.2,4.3L324,147.7q-1.5,5.1-3.6,6.6a11.23,11.23,0,0,1-6.5,1.7H299.3c-3.2,0-5.4-.5-6.8-1.7s-2.6-3.4-3.2-6.8L262.9,37.7,236.7,147.4c-.9,3.4-1.9,5.6-3.2,6.8s-3.7,1.7-6.8,1.7H211.9Zm218.8,4.6a109.2,109.2,0,0,1-26.2-3.1c-8.5-2.1-15.2-4.3-19.6-6.8-2.7-1.5-4.6-3.2-5.3-4.8a11.49,11.49,0,0,1-1-4.8v-8.7c0-3.6,1.4-5.3,3.9-5.3a11.77,11.77,0,0,1,3.1.5c1,.3,2.6,1,4.3,1.7a92.93,92.93,0,0,0,18.7,6,99.81,99.81,0,0,0,20.3,2c10.7,0,19.1-1.9,24.9-5.6a18.32,18.32,0,0,0,8.9-16.2,16.29,16.29,0,0,0-4.6-11.9c-3.1-3.2-8.9-6.1-17.2-8.9l-24.7-7.7c-12.4-3.9-21.6-9.7-27.2-17.4a40.62,40.62,0,0,1-8.5-24.7,37.28,37.28,0,0,1,4.6-18.9,45.72,45.72,0,0,1,12.3-14,55.57,55.57,0,0,1,17.7-8.9A76,76,0,0,1,436.6,0,87.22,87.22,0,0,1,448,.7c3.9.5,7.5,1.2,11.1,1.9,3.4.9,6.6,1.7,9.7,2.7A33.51,33.51,0,0,1,476,8.4c2.4,1.4,4.1,2.7,5.1,4.3a9.3,9.3,0,0,1,1.5,5.6v8c0,3.6-1.4,5.4-3.9,5.4-1.4,0-3.6-.7-6.5-2q-14.55-6.6-32.7-6.6c-9.7,0-17.4,1.5-22.6,4.8s-8,8.2-8,15.2A16,16,0,0,0,414,55.2c3.4,3.2,9.7,6.5,18.7,9.4l24.2,7.7c12.3,3.9,21.1,9.4,26.4,16.3a38.41,38.41,0,0,1,7.8,23.8,44,44,0,0,1-4.4,19.8,47.24,47.24,0,0,1-12.4,15,54.23,54.23,0,0,1-18.9,9.5A81.19,81.19,0,0,1,430.7,160.4Z"
+        transform="translate(-0.02)"
+        style={{ fill: '#ffffff' }}
+      />
+      <path
+        d="M462.9,243.1c-56,41.4-137.4,63.3-207.4,63.3-98.1,0-186.5-36.3-253.2-96.6-5.3-4.8-.5-11.2,5.8-7.5,72.2,41.9,161.3,67.3,253.4,67.3,62.2,0,130.4-12.9,193.3-39.5C464.1,225.9,472.1,236.3,462.9,243.1Zm23.3-26.5c-7.2-9.2-47.3-4.4-65.6-2.2-5.4.7-6.3-4.1-1.4-7.7,32-22.5,84.6-16,90.8-8.5,6.1,7.7-1.7,60.3-31.7,85.5-4.6,3.9-9,1.9-7-3.2C478.2,263.6,493.4,225.6,486.2,216.6Z"
+        transform="translate(-0.02)"
+        style={{ fill: '#f90' }}
+      />
+    </svg>
+  ) : (
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.9 306.4" height={height}>
       <path
         d="M144.3,111.5a51.73,51.73,0,0,0,1.9,15.2,119.35,119.35,0,0,0,5.4,12.3,7,7,0,0,1,1.2,3.9c0,1.7-1,3.4-3.2,5.1l-10.7,7.2a8.28,8.28,0,0,1-4.4,1.5,8,8,0,0,1-5.1-2.4,54.73,54.73,0,0,1-6.1-8c-1.7-2.9-3.4-6.1-5.3-10q-19.95,23.55-50.1,23.5c-14.3,0-25.7-4.1-34.1-12.3s-12.6-19.1-12.6-32.7c0-14.5,5.1-26.2,15.5-35.1S60.9,66.4,78.4,66.4a129.15,129.15,0,0,1,18.1,1.4c6.3.9,12.8,2.2,19.6,3.7V59.1c0-12.9-2.7-22-8-27.2s-14.6-7.8-27.8-7.8a79,79,0,0,0-18.4,2.2,131,131,0,0,0-18.4,5.8,39.81,39.81,0,0,1-6,2.2,12.09,12.09,0,0,1-2.7.5c-2.4,0-3.6-1.7-3.6-5.3V21.2c0-2.7.3-4.8,1.2-6a13.21,13.21,0,0,1,4.8-3.6A99.24,99.24,0,0,1,58.7,3.9,103.71,103.71,0,0,1,85.3.7c20.3,0,35.1,4.6,44.6,13.8S144,37.7,144,56.4v55.2h.3ZM75.2,137.4a53.46,53.46,0,0,0,17.5-3.1,37.9,37.9,0,0,0,16.2-10.9,26.78,26.78,0,0,0,5.8-10.9,62.13,62.13,0,0,0,1.7-14.8V90.5a141.49,141.49,0,0,0-15.7-2.9,123.85,123.85,0,0,0-16-1c-11.4,0-19.8,2.2-25.4,6.8S51,104.5,51,113c0,8,2,14,6.3,18.1C61.4,135.3,67.3,137.4,75.2,137.4Zm136.7,18.4c-3.1,0-5.1-.5-6.5-1.7-1.4-1-2.6-3.4-3.6-6.6l-40-131.6a30.18,30.18,0,0,1-1.5-6.8c0-2.7,1.4-4.3,4.1-4.3h16.7c3.2,0,5.4.5,6.6,1.7,1.4,1,2.4,3.4,3.4,6.6l28.6,112.7L246.3,13.1c.9-3.4,1.9-5.6,3.2-6.6a11.85,11.85,0,0,1,6.8-1.7H270c3.2,0,5.4.5,6.8,1.7,1.4,1,2.6,3.4,3.2,6.6l26.9,114.1L336.4,13.1c1-3.4,2.2-5.6,3.4-6.6a11.36,11.36,0,0,1,6.6-1.7h15.8c2.7,0,4.3,1.4,4.3,4.3,0,.9-.2,1.7-.3,2.7a27,27,0,0,1-1.2,4.3L324,147.7q-1.5,5.1-3.6,6.6a11.23,11.23,0,0,1-6.5,1.7H299.3c-3.2,0-5.4-.5-6.8-1.7s-2.6-3.4-3.2-6.8L262.9,37.7,236.7,147.4c-.9,3.4-1.9,5.6-3.2,6.8s-3.7,1.7-6.8,1.7H211.9Zm218.8,4.6a109.2,109.2,0,0,1-26.2-3.1c-8.5-2.1-15.2-4.3-19.6-6.8-2.7-1.5-4.6-3.2-5.3-4.8a11.49,11.49,0,0,1-1-4.8v-8.7c0-3.6,1.4-5.3,3.9-5.3a11.77,11.77,0,0,1,3.1.5c1,.3,2.6,1,4.3,1.7a92.93,92.93,0,0,0,18.7,6,99.81,99.81,0,0,0,20.3,2c10.7,0,19.1-1.9,24.9-5.6a18.32,18.32,0,0,0,8.9-16.2,16.29,16.29,0,0,0-4.6-11.9c-3.1-3.2-8.9-6.1-17.2-8.9l-24.7-7.7c-12.4-3.9-21.6-9.7-27.2-17.4a40.62,40.62,0,0,1-8.5-24.7,37.28,37.28,0,0,1,4.6-18.9,45.72,45.72,0,0,1,12.3-14,55.57,55.57,0,0,1,17.7-8.9A76,76,0,0,1,436.6,0,87.22,87.22,0,0,1,448,.7c3.9.5,7.5,1.2,11.1,1.9,3.4.9,6.6,1.7,9.7,2.7A33.51,33.51,0,0,1,476,8.4c2.4,1.4,4.1,2.7,5.1,4.3a9.3,9.3,0,0,1,1.5,5.6v8c0,3.6-1.4,5.4-3.9,5.4-1.4,0-3.6-.7-6.5-2q-14.55-6.6-32.7-6.6c-9.7,0-17.4,1.5-22.6,4.8s-8,8.2-8,15.2A16,16,0,0,0,414,55.2c3.4,3.2,9.7,6.5,18.7,9.4l24.2,7.7c12.3,3.9,21.1,9.4,26.4,16.3a38.41,38.41,0,0,1,7.8,23.8,44,44,0,0,1-4.4,19.8,47.24,47.24,0,0,1-12.4,15,54.23,54.23,0,0,1-18.9,9.5A81.19,81.19,0,0,1,430.7,160.4Z"
diff --git a/src/components/shared/logos/VerizonLogo.js b/src/components/shared/logos/VerizonLogo.js
index 1d5891b8f..bd2220da2 100644
--- a/src/components/shared/logos/VerizonLogo.js
+++ b/src/components/shared/logos/VerizonLogo.js
@@ -1,7 +1,15 @@
 import React from 'react';
 
-function VerizonLogo({ height = 25 }) {
-  return (
+function VerizonLogo({ height = 25, theme = 'dark' }) {
+  return theme === 'dark' ? (
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 370 81.96" height={height}>
+      <path d="M361.83,0,341.66,43.24,334,26.83H325.8l12.52,26.84H345L370,0h-8.17Z" style={{ fill: '#cd040b' }} />
+      <path
+        d="M147.53,7.83h16.4V22.34h-16.4ZM18.59,80.29H35.71L54.29,26.83H37.9L27.46,61.18h-.21L16.81,26.83H0L18.59,80.29ZM78.73,37c5.74,0,9.71,4.28,10.33,10.55H67.24C68.49,41.14,71.94,37,78.73,37m.83,33.1c-7.2,0-11.59-4.7-12.42-11.9h38.52c.11-11.49-2.92-20.68-9.29-26.42-4.49-4.18-10.44-6.47-18-6.47-16.08,0-27.25,12.21-27.25,28.19s10.65,28.4,28.3,28.4a28,28,0,0,0,16.39-4.81c4.7-3.23,8-7.93,9-12.63H89.17c-1.57,3.55-4.81,5.64-9.61,5.64m30,10.23h16.29V55.75c0-11.17,6.68-16.08,16.91-14.72H143V26.94a9.08,9.08,0,0,0-3.34-.42c-6.37,0-10.65,2.92-14.3,9.19h-.32V26.83H109.53V80.29Zm38,0h16.4V26.83h-16.4Zm20.89,0h45.73V67.45h-25.9v-.31L213,39.36V26.83H168.42V39.67h25.05V40L168.42,68V80.29ZM243.07,70c-7.73,0-11.8-6.48-11.8-16.29s4.07-16.29,11.8-16.29,12,6.37,12,16.29S250.8,70,243.07,70m.1-44.59c-17,0-28.4,12.22-28.4,28.3S226.16,82,243.17,82s28.4-12.32,28.4-28.29-11.38-28.3-28.4-28.3m32,54.92h16.29V50.53c0-6.78,4-11.58,9.81-11.58,5.64,0,8.57,4,8.57,9.6V80.29h16.29V45.42c0-11.8-7.1-20.15-18.59-20.15-7.31,0-12.42,3.13-16.28,8.87h-.32V26.83H275.12V80.29Z"
+        style={{ fill: '#ffffff' }}
+      />
+    </svg>
+  ) : (
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 370 81.96" height={height}>
       <path d="M361.83,0,341.66,43.24,334,26.83H325.8l12.52,26.84H345L370,0h-8.17Z" style={{ fill: '#cd040b' }} />
       <path d="M147.53,7.83h16.4V22.34h-16.4ZM18.59,80.29H35.71L54.29,26.83H37.9L27.46,61.18h-.21L16.81,26.83H0L18.59,80.29ZM78.73,37c5.74,0,9.71,4.28,10.33,10.55H67.24C68.49,41.14,71.94,37,78.73,37m.83,33.1c-7.2,0-11.59-4.7-12.42-11.9h38.52c.11-11.49-2.92-20.68-9.29-26.42-4.49-4.18-10.44-6.47-18-6.47-16.08,0-27.25,12.21-27.25,28.19s10.65,28.4,28.3,28.4a28,28,0,0,0,16.39-4.81c4.7-3.23,8-7.93,9-12.63H89.17c-1.57,3.55-4.81,5.64-9.61,5.64m30,10.23h16.29V55.75c0-11.17,6.68-16.08,16.91-14.72H143V26.94a9.08,9.08,0,0,0-3.34-.42c-6.37,0-10.65,2.92-14.3,9.19h-.32V26.83H109.53V80.29Zm38,0h16.4V26.83h-16.4Zm20.89,0h45.73V67.45h-25.9v-.31L213,39.36V26.83H168.42V39.67h25.05V40L168.42,68V80.29ZM243.07,70c-7.73,0-11.8-6.48-11.8-16.29s4.07-16.29,11.8-16.29,12,6.37,12,16.29S250.8,70,243.07,70m.1-44.59c-17,0-28.4,12.22-28.4,28.3S226.16,82,243.17,82s28.4-12.32,28.4-28.29-11.38-28.3-28.4-28.3m32,54.92h16.29V50.53c0-6.78,4-11.58,9.81-11.58,5.64,0,8.57,4,8.57,9.6V80.29h16.29V45.42c0-11.8-7.1-20.15-18.59-20.15-7.31,0-12.42,3.13-16.28,8.87h-.32V26.83H275.12V80.29Z" />
diff --git a/src/components/shared/webide/Editor.js b/src/components/shared/webide/Editor.js
index 8a673a2ab..af0403cae 100644
--- a/src/components/shared/webide/Editor.js
+++ b/src/components/shared/webide/Editor.js
@@ -39,7 +39,7 @@ function Editor({ active, file, onFileChange, theme }) {
     return null;
   }
 
-  const filepathRelativeToComponentsDir = file.path.split('/').slice(1).join('/');
+  const filepathRelativeToComponentsDir = file?.path.split('/').slice(1).join('/');
 
   // eslint-disable-next-line no-unused-vars
   return <>
diff --git a/src/components/shared/webide/EditorMenu.js b/src/components/shared/webide/EditorMenu.js
index b09e3d946..c1432a3c7 100644
--- a/src/components/shared/webide/EditorMenu.js
+++ b/src/components/shared/webide/EditorMenu.js
@@ -6,28 +6,29 @@ import cn from 'classnames';
 export function SaveButton({ onClick, disabled }) {
 
   const [ loading, setLoading ] = useState(false);
+
   return (
     <button
       type="button"
       disabled={ disabled }
       title="save file to instance"
-      className={ cn("save-code fas", {
-        disabled, 
-        'fa-save': !loading,
-        'fa-spinner': loading,
-        'fa-spin': loading
-      }) }
+      className={
+        cn("save-code fas", {
+          disabled, 
+          'fa-save': !loading,
+          'fa-spinner': loading,
+          'fa-spin': loading
+        })
+      }
       onClick={ 
         async () => {
 
-          setLoading(true);
+          setLoading(() => true);
           await onClick();
-          setTimeout(() => {
-            setLoading(false);
-          }, 500);
+          setLoading(() => false);
         }
       } />
-  )
+  );
 
 }
 
@@ -74,36 +75,37 @@ export function RestartOnSaveToggle({ onClick, restartAfterSave }) {
   );
 }
 
-export function RevertFileButton({ onClick, disabled }) {
+export function RevertFileButton({ onClick, disabled, loading }) {
+
   return (
     <button
       type="button"
       disabled={ disabled }
       title="revert file to previously saved state"
-      className={
-        cn('revert-file fas fa-history', { disabled })
+      onClick={
+        async () => {
+          await onClick();
+        }
       }
-      onClick={ onClick } />
+      className={
+        cn("revert-file fas", {
+          disabled,
+          'fa-history': !loading,
+          'fa-spinner': loading,
+          'fa-spin': loading,
+        })
+      } /> 
+  );
 
-  )
 }
 
-// TODO: convert to mapping children to a list instead of explicitly doing all of this
-export default function EditorMenu({ SaveButton: SaveBtn, RestartInstanceButton: RestartInstanceBtn, RestartOnSaveToggle: RestartOnSaveTgl, RevertFileButton: RevertFileBtn }) {
-  return (
+export default function EditorMenu({ children }) {
+
+  const keys = children?.map(() => crypto.randomUUID());
+
+  return children ? (
     <ul className="editor-menu">
-      <li>
-        <SaveBtn />
-      </li>
-      <li>
-        <RestartInstanceBtn />
-      </li>
-      <li>
-        <RestartOnSaveTgl />
-      </li>
-      <li>
-        <RevertFileBtn />
-      </li>
+      { children.map((child, index) => <li key={keys[index]}>{child}</li>) }
     </ul>
-  )
+  ) : null;
 }
diff --git a/src/components/shared/webide/FileMenu.js b/src/components/shared/webide/FileMenu.js
index c84a03cf4..aadc1dd8a 100644
--- a/src/components/shared/webide/FileMenu.js
+++ b/src/components/shared/webide/FileMenu.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import cn from 'classnames';
-import { v4 as uuid } from 'uuid';
 
 
 export function DeleteFolderButton({ onClick, disabled }) {
@@ -82,7 +81,7 @@ function FileMenu({ children }) {
   return (
     <ul className="file-menu">
       {
-        children.map(child => <li className="file-menu-item" key={ uuid() }>{child}</li>)
+        children.map(child => <li className="file-menu-item" key={ crypto.randomUUID() }>{child}</li>)
       }
     </ul>
   )
diff --git a/src/components/shared/webide/index.js b/src/components/shared/webide/index.js
index bba8f80f8..1701a0403 100644
--- a/src/components/shared/webide/index.js
+++ b/src/components/shared/webide/index.js
@@ -61,6 +61,7 @@ function WebIDE({
   const [ activeEditorWindow, setActiveEditorWindow ] = useState(EDITOR_WINDOWS.DEFAULT_WINDOW);
   const [ previousActiveEditorWindow, setPreviousActiveEditorWindow ] = useState(null);
   const [ restartAfterSave, setRestartAfterSave ] = useState(true);
+  const [ revertingFile, setRevertingFile ] = useState(false);
 
   const hasProjects = fileTree?.entries?.length > 0;
   const canAddFile = Boolean(hasProjects && selectedFolder);  // can only add a file if a target folder is selected
@@ -233,57 +234,50 @@ function WebIDE({
           } />
       </Col>
       <Col className="editor-window-container col-md-8">
-        <EditorMenu
-          SaveButton={
-            () => (
-              <SaveButton
-                disabled={ !(selectedFile && activeEditorWindow === EDITOR_WINDOWS.CODE_EDITOR_WINDOW) }
-                onClick={
-                  async () => {
-                    await onFileSave(selectedFile, restartAfterSave)
-                  }
-                } />
-            )
-          }
-          RestartInstanceButton={
-            () => (
-              <RestartInstanceButton
-                restarting={restartingInstance}
-                onClick={
-                  async () => {
-                    await restartInstance();
-                  }
-                } />
-            )
-          }
-          RestartOnSaveToggle={
-            () => (
-              <RestartOnSaveToggle
-                restartAfterSave={restartAfterSave}
-                onClick={
-                  () => {
-                    setRestartAfterSave(!restartAfterSave);
-                  }
-                } />
-            )
-          }
-          RevertFileButton={
-            () => (
-              <RevertFileButton
-                disabled={!selectedFile?.cached}
-                onClick={
-                  async () => {
-                    const updatedContent = await onRevertFile(selectedFile);
-                    setSelectedFile({
-                      ...selectedFile,
-                      content: updatedContent,
-                      cached: false
-                    });
-                  }
-                }  />
-            )
-          }
-        />
+        <EditorMenu>
+          <SaveButton
+            disabled={ !(selectedFile && activeEditorWindow === EDITOR_WINDOWS.CODE_EDITOR_WINDOW) }
+            onClick={
+              async () => {
+                await onFileSave(selectedFile, restartAfterSave)
+              }
+            } />
+          <RestartInstanceButton
+            restarting={restartingInstance}
+            onClick={
+              async () => {
+                await restartInstance();
+              }
+            } />
+          <RestartOnSaveToggle
+            restartAfterSave={restartAfterSave}
+            onClick={
+              () => {
+                setRestartAfterSave(!restartAfterSave);
+              }
+            } />
+          <RevertFileButton
+            loading={ revertingFile }
+            disabled={!(selectedFile?.cached && activeEditorWindow === EDITOR_WINDOWS.CODE_EDITOR_WINDOW)}
+            onClick={
+              async () => {
+
+                setRevertingFile(true);
+                try { 
+                  const updatedContent = await onRevertFile(selectedFile);
+                  const updatedSelectedFile = {
+                    ...selectedFile,
+                    content: updatedContent,
+                    cached: false
+                  };
+                  setSelectedFile(updatedSelectedFile);
+                } finally {
+                  setRevertingFile(false);
+                }
+
+              }
+            } />
+        </EditorMenu>
         <EditorWindow>
           <DefaultWindow
             fileTree={fileTree}
diff --git a/src/functions/api/instance/getComponents.js b/src/functions/api/instance/getComponents.js
index e5490177a..d88b3dae6 100644
--- a/src/functions/api/instance/getComponents.js
+++ b/src/functions/api/instance/getComponents.js
@@ -1,4 +1,3 @@
-import { v4 as uuid } from 'uuid';
 import queryInstance from '../queryInstance';
 
 // this 'addMetadata' logic probably belongs in src/functions/instance
@@ -11,7 +10,7 @@ function addMetadata(fileTree, path, rootDir, readOnly=false) {
 
   if (path === rootDir) {
     fileTree.path = rootDir;
-    fileTree.key = uuid();
+    fileTree.key = crypto.randomUUID();
   }
 
   for (const entry of fileTree.entries) {
@@ -27,7 +26,7 @@ function addMetadata(fileTree, path, rootDir, readOnly=false) {
     const [ , project ] = newPath.split('/');
     entry.project = project;
     entry.path = newPath;
-    entry.key = uuid();
+    entry.key = crypto.randomUUID();
     entry.readOnly = readOnly || !!entry.package;
 
     addMetadata(entry, newPath, rootDir, entry.readOnly);