diff --git a/frontend/src/Editor/Box.jsx b/frontend/src/Editor/Box.jsx
index 1fefeca782..ea535ee60c 100644
--- a/frontend/src/Editor/Box.jsx
+++ b/frontend/src/Editor/Box.jsx
@@ -71,6 +71,7 @@ export const Box = function Box({
 
   let styles = {
     height: '100%',
+    padding: '1px',
   };
 
   if (inCanvas) {
diff --git a/frontend/src/Editor/Components/DaterangePicker.jsx b/frontend/src/Editor/Components/DaterangePicker.jsx
index afacc6dc6d..3c718ee851 100644
--- a/frontend/src/Editor/Components/DaterangePicker.jsx
+++ b/frontend/src/Editor/Components/DaterangePicker.jsx
@@ -58,6 +58,7 @@ export const DaterangePicker = function DaterangePicker({
 
   return (
     <div
+      className="px-1"
       style={{ width, height, display: parsedWidgetVisibility ? '' : 'none' }}
       onClick={(event) => {
         event.stopPropagation();
diff --git a/frontend/src/Editor/Components/components.js b/frontend/src/Editor/Components/components.js
index 936e7a3aa5..3726ca3348 100644
--- a/frontend/src/Editor/Components/components.js
+++ b/frontend/src/Editor/Components/components.js
@@ -253,7 +253,7 @@ export const componentTypes = [
     description: 'Text field for forms',
     component: 'TextInput',
     defaultSize: {
-      width: 200,
+      width: 210,
       height: 30,
     },
     others: {
@@ -306,7 +306,7 @@ export const componentTypes = [
     description: 'Number field for forms',
     component: 'NumberInput',
     defaultSize: {
-      width: 200,
+      width: 210,
       height: 30,
     },
     others: {
@@ -398,7 +398,7 @@ export const componentTypes = [
     description: 'A single checkbox',
     component: 'Checkbox',
     defaultSize: {
-      width: 200,
+      width: 150,
       height: 30,
     },
     others: {
@@ -440,7 +440,7 @@ export const componentTypes = [
     description: 'Radio buttons',
     component: 'RadioButton',
     defaultSize: {
-      width: 200,
+      width: 210,
       height: 30,
     },
     others: {
@@ -488,7 +488,7 @@ export const componentTypes = [
     description: 'Toggle Switch',
     component: 'ToggleSwitch',
     defaultSize: {
-      width: 130,
+      width: 150,
       height: 30,
     },
     others: {
@@ -529,7 +529,7 @@ export const componentTypes = [
     description: 'Text area form field',
     component: 'TextArea',
     defaultSize: {
-      width: 250,
+      width: 240,
       height: 100,
     },
     others: {
@@ -571,7 +571,7 @@ export const componentTypes = [
     component: 'DaterangePicker',
     defaultSize: {
       width: 300,
-      height: 32,
+      height: 40,
     },
     others: {
       showOnDesktop: { type: 'toggle', displayName: 'Show on desktop? ' },
@@ -618,7 +618,7 @@ export const componentTypes = [
       loadingState: { type: 'code', displayName: 'Show loading state' },
     },
     defaultSize: {
-      width: 200,
+      width: 120,
       height: 30,
     },
     events: [],
@@ -651,8 +651,8 @@ export const componentTypes = [
     displayName: 'Image',
     description: 'Display an Image',
     defaultSize: {
-      width: 200,
-      height: 200,
+      width: 210,
+      height: 210,
     },
     component: 'Image',
     others: {
@@ -691,7 +691,7 @@ export const componentTypes = [
     displayName: 'Container',
     description: 'Wrapper for multiple components',
     defaultSize: {
-      width: 200,
+      width: 210,
       height: 200,
     },
     component: 'Container',
@@ -728,8 +728,8 @@ export const componentTypes = [
     displayName: 'Dropdown',
     description: 'Select one value from options',
     defaultSize: {
-      width: 210,
-      height: 30,
+      width: 240,
+      height: 35,
     },
     component: 'DropDown',
     others: {
@@ -782,7 +782,7 @@ export const componentTypes = [
     displayName: 'Multiselect',
     description: 'Select multiple values from options',
     defaultSize: {
-      width: 210,
+      width: 270,
       height: 30,
     },
     component: 'Multiselect',
@@ -870,8 +870,8 @@ export const componentTypes = [
     description: 'Display Google Maps',
     component: 'Map',
     defaultSize: {
-      width: 400,
-      height: 400,
+      width: 420,
+      height: 420,
     },
     others: {
       showOnDesktop: { type: 'toggle', displayName: 'Show on desktop? ' },
@@ -976,7 +976,7 @@ export const componentTypes = [
     description: 'Star rating',
     component: 'StarRating',
     defaultSize: {
-      width: 220,
+      width: 240,
       height: 30,
     },
     others: {
diff --git a/frontend/src/Editor/DraggableBox.jsx b/frontend/src/Editor/DraggableBox.jsx
index 2be42ba876..a58a44eef3 100644
--- a/frontend/src/Editor/DraggableBox.jsx
+++ b/frontend/src/Editor/DraggableBox.jsx
@@ -121,7 +121,7 @@ export const DraggableBox = function DraggableBox({
     display: 'inline-block',
     alignItems: 'center',
     justifyContent: 'center',
-    padding: '2px',
+    padding: '0px',
   };
 
   let refProps = {};
@@ -183,8 +183,8 @@ export const DraggableBox = function DraggableBox({
             style={{ ...style }}
             resizeGrid={[30, 10]}
             size={{
-              width: scaleWidth(currentLayoutOptions.width, scaleValue) + 6,
-              height: currentLayoutOptions.height + 6,
+              width: scaleWidth(currentLayoutOptions.width, scaleValue),
+              height: currentLayoutOptions.height,
             }}
             position={{
               x: currentLayoutOptions ? currentLayoutOptions.left : 0,
@@ -203,7 +203,7 @@ export const DraggableBox = function DraggableBox({
             }}
           >
             <div ref={preview} role="DraggableBox" style={isResizing ? { opacity: 0.5 } : { opacity: 1 }}>
-              {mode === 'edit' && mouseOver && (
+              {mode === 'edit' && mouseOver && !isResizing && (
                 <ConfigHandle
                   id={id}
                   removeComponent={removeComponent}
@@ -215,8 +215,8 @@ export const DraggableBox = function DraggableBox({
               <Box
                 component={component}
                 id={id}
-                width={scaleWidth(currentLayoutOptions.width, scaleValue)}
-                height={currentLayoutOptions.height}
+                width={scaleWidth(currentLayoutOptions.width, scaleValue) - 4}
+                height={currentLayoutOptions.height - 4}
                 mode={mode}
                 changeCanDrag={changeCanDrag}
                 inCanvas={inCanvas}