diff --git a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
index b1c13c0240..44268a9cb2 100644
--- a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
+++ b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
@@ -55,9 +55,7 @@ const AppsmithLayouts: AppsmithLayoutConfigOption[] = [
 ];
 
 const LayoutControlWrapper = styled.div`
-  position: absolute;
-  height: ${(props) => props.theme.spaces[15]}px;
-  width: 100%;
+  height: 40px;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/app/client/src/pages/Editor/WidgetsEditor.tsx b/app/client/src/pages/Editor/WidgetsEditor.tsx
index e67598327b..2c34b9545a 100644
--- a/app/client/src/pages/Editor/WidgetsEditor.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor.tsx
@@ -161,10 +161,10 @@ function WidgetsEditor() {
           onClick={handleWrapperClick}
           onDragStart={onDragStart}
         >
+          <MainContainerLayoutControl />
           <CanvasContainer className={getCanvasClassName()} key={currentPageId}>
             {node}
           </CanvasContainer>
-          <MainContainerLayoutControl />
           <Debugger />
           <CrudInfoModal />
         </EditorWrapper>
diff --git a/app/client/src/pages/common/ArtBoard.tsx b/app/client/src/pages/common/ArtBoard.tsx
index 46a09fdb85..351056630a 100644
--- a/app/client/src/pages/common/ArtBoard.tsx
+++ b/app/client/src/pages/common/ArtBoard.tsx
@@ -1,7 +1,7 @@
 import styled from "styled-components";
 export default styled.div<{ width: number }>`
   width: ${(props) => props.width}px;
-  margin: ${(props) => props.theme.spaces[15]}px auto 0;
+  margin: 0 auto;
   position: relative;
   background: ${(props) => {
     return props.theme.colors.artboard;
diff --git a/app/client/src/pages/common/CanvasMultiPointerArena.tsx b/app/client/src/pages/common/CanvasMultiPointerArena.tsx
index 368593428c..dc97410035 100644
--- a/app/client/src/pages/common/CanvasMultiPointerArena.tsx
+++ b/app/client/src/pages/common/CanvasMultiPointerArena.tsx
@@ -27,7 +27,7 @@ const Canvas = styled.canvas`
   position: absolute;
   top: 0;
   left: 0;
-  height: calc(100% + ${(props) => props.theme.canvasBottomPadding}px);
+  height: 100%;
   width: 100%;
   overflow-y: auto;
   z-index: 1;