diff --git a/src/js/blocks/row/editor.scss b/src/js/blocks/row/editor.scss
index 4251e8a..e9fbdd8 100644
--- a/src/js/blocks/row/editor.scss
+++ b/src/js/blocks/row/editor.scss
@@ -2,24 +2,21 @@ $totalColumns: 12;
 
 .wp-block-gutenbergjs-row {
 	display: block;
-	
-	.editor-inner-blocks {
+	margin-left: -$block-padding;
+	margin-right: -$block-padding;
+
+	> .editor-inner-blocks {
 		display: grid;
 		grid-auto-flow: dense;
 		grid-gap: 0;
 		grid-template-columns: repeat($totalColumns, 1fr);
 
 		.editor-block-list__layout {
-			&:first-child {
-				margin-left: -$block-padding;
-			}
-			&:last-child {
-				margin-right: -$block-padding;
-			}
-
 			// This max-width is used to constrain the main editor column, it should not cascade into columns
 			.editor-block-list__block {
 				max-width: none;
+				margin-left: 0px;
+				margin-right: 0px;
 			}
 		}
 	}
diff --git a/src/js/blocks/section/index.js b/src/js/blocks/section/index.js
index b11692b..6583e59 100644
--- a/src/js/blocks/section/index.js
+++ b/src/js/blocks/section/index.js
@@ -98,7 +98,7 @@ export const settings = {
 
     return (
       <div className={ classes } style={ style } { ...data }>
-        <div className="wp-block-storypage-section-content">
+        <div className="wp-block-gutenbergjs-section-content">
           <InnerBlocks.Content />
         </div>
       </div>
diff --git a/src/js/blocks/section/style.scss b/src/js/blocks/section/style.scss
index 745a504..421d7c7 100644
--- a/src/js/blocks/section/style.scss
+++ b/src/js/blocks/section/style.scss
@@ -2,16 +2,16 @@
 	display: grid;
 	grid-gap: 1em;
 	position: relative;
-    background-size: cover;
-    background-position: 50%;
-    min-height: 430px;
-    width: 100%;
+	background-size: cover;
+	background-position: 50%;
+	min-height: 430px;
+	width: 100%;
 
-    &.has-parallax {
+	&.has-parallax {
 		background-attachment: fixed;
 	}
 
-    &.has-background-dim:before {
+	&.has-background-dim:before {
 		content: '';
 		position: absolute;
 		top: 0;
@@ -27,7 +27,7 @@
 			top: 0;
 			left: 0;
 			bottom: 0;
-			right: 0;			
+			right: 0;
 			z-index: 1;
 		}
 	}
@@ -37,11 +37,9 @@
 			background-color: rgba( #000, $i * 0.1 );
 		}
 	}
-	
+
 	&.has-max-width {
 		margin-left: auto;
 		margin-right: auto;
 	}
-
-
 }