diff --git a/src/components/layouts/AssetReference.js b/src/components/layouts/AssetReference.js
index d4bcfd89..f6af5e4e 100644
--- a/src/components/layouts/AssetReference.js
+++ b/src/components/layouts/AssetReference.js
@@ -30,7 +30,7 @@ export const AssetReference = ({ editor, editorActions, user, authActions, scene
             collections={collections}
             layoutType={layoutTypes.REFERENCE}
         />
-        <div className="row no-gutters">
+        <div className="row g-0">
             <AssetReferencePage />
         </div>
         <Footer />
diff --git a/src/components/layouts/Collection.js b/src/components/layouts/Collection.js
index b18a53a3..3134e6b9 100644
--- a/src/components/layouts/Collection.js
+++ b/src/components/layouts/Collection.js
@@ -34,7 +34,7 @@ export const Collection = ({ editor, editorActions, user, userSettings, userActi
             collection={match.params.collection}
             layoutType={layoutTypes.COLLECTION}
         />
-        <div className="row no-gutters">
+        <div className="row g-0">
             <div id="interface" className="col-12 col-md-4">
                 <SelectProject
                     selectedCollection={match.params.collection}
diff --git a/src/components/layouts/Guided.js b/src/components/layouts/Guided.js
index 608b95b4..90f6683a 100644
--- a/src/components/layouts/Guided.js
+++ b/src/components/layouts/Guided.js
@@ -36,7 +36,7 @@ export const Guided = ({ editor, user, usersettings, userActions, scene, editorA
             collectionActions={collectionActions}
             collections={collections}
         />
-        <div className="row no-gutters">
+        <div className="row g-0">
             {
                 scene.settings.viewOnly
                     ?
diff --git a/src/components/layouts/Reference.js b/src/components/layouts/Reference.js
index 19ce7b7d..2fc14149 100644
--- a/src/components/layouts/Reference.js
+++ b/src/components/layouts/Reference.js
@@ -30,7 +30,7 @@ export const Reference = ({ editor, editorActions, user, authActions, scene, sce
             collections={collections}
             layoutType={layoutTypes.REFERENCE}
         />
-        <div className="row no-gutters">
+        <div className="row g-0">
             <ReferencePage />
         </div>
         <Footer />
diff --git a/src/components/layouts/ReferenceExample.js b/src/components/layouts/ReferenceExample.js
index b5fe7151..b0c4bc2e 100644
--- a/src/components/layouts/ReferenceExample.js
+++ b/src/components/layouts/ReferenceExample.js
@@ -36,7 +36,7 @@ export const ReferenceExample = ({ editor, user, scene, referenceExample, refere
             referenceExampleActions={referenceExampleActions}
             layoutType={layoutTypes.REF_EXAMPLE}
         />
-        <div className="row no-gutters">
+        <div className="row g-0">
             {
                 scene.settings.viewOnly
                     ?
diff --git a/src/components/structural/WelcomeScreen.js b/src/components/structural/WelcomeScreen.js
index 1dca3fad..4b350527 100644
--- a/src/components/structural/WelcomeScreen.js
+++ b/src/components/structural/WelcomeScreen.js
@@ -322,7 +322,7 @@ class Welcome extends React.Component {
                                 <this.cookieMessage />
                             </Hidden>
                             <hr />
-                            <div className="row no-gutters">
+                            <div className="row g-0">
                                 <div id="welcome-description" className="col-12 col-md-6 col-lg-8">
                                     <p>MYR is an educational tool that strikes a balance with the ease of use and challenge. We drew inspiration from Logo Turtle and Processing to provide a beginner friendly experience for teaching and learning with MYR. If you want to learn more about MYR itself, visit our <a href="/about" target="_blank" rel="noopener noreferrer">about page</a>.</p>
                                     <p>Within the editor you can create 3D scenes using JavaScript and the MYR API. You can then view your scene in the viewer using a computer, tablet, smartphone, or a VR headset.</p>