diff --git a/app/client/src/editorComponents/CalloutComponent.tsx b/app/client/src/editorComponents/CalloutComponent.tsx
index eeeb302043..087297a791 100644
--- a/app/client/src/editorComponents/CalloutComponent.tsx
+++ b/app/client/src/editorComponents/CalloutComponent.tsx
@@ -1,30 +1,20 @@
 import * as React from "react";
 import { IComponentProps } from "./BaseComponent";
+import PositionContainer from "./PositionContainer";
 import { Callout, Code, H5, Intent, Switch } from "@blueprintjs/core";
-import styled from "../constants/DefaultTheme";
-
-const CalloutContainer = styled("span")<ICalloutComponentProps>`
-  color: ${props => props.theme.primaryColor};
-  position: ${props => props.style.positionType};
-  left: ${props => {
-    return props.style.xPosition + props.style.xPositionUnit;
-  }};
-  top: ${props => {
-    return props.style.yPosition + props.style.yPositionUnit;
-  }};
-`;
 
 class CalloutComponent extends React.Component<ICalloutComponentProps> {
   render() {
     return (
-      <CalloutContainer {...this.props}>
+      <PositionContainer {...this.props}>
         <Callout
           {...this.props}
           title={this.props.title ? this.props.title : undefined}
+          intent={this.props.intent}
         >
           {this.props.description}
         </Callout>
-      </CalloutContainer>
+      </PositionContainer>
     );
   }
 }
diff --git a/app/client/src/editorComponents/IconComponent.tsx b/app/client/src/editorComponents/IconComponent.tsx
index 74078c6348..5007a4544d 100644
--- a/app/client/src/editorComponents/IconComponent.tsx
+++ b/app/client/src/editorComponents/IconComponent.tsx
@@ -2,25 +2,14 @@ import * as React from "react";
 import { IComponentProps } from "./BaseComponent";
 import { Icon, Intent } from "@blueprintjs/core";
 import { IconName } from "@blueprintjs/icons";
-import styled from "../constants/DefaultTheme";
-
-const IconContainer = styled("span")<IIconComponentProps>`
-  color: ${props => props.theme.primaryColor};
-  position: ${props => props.style.positionType};
-  left: ${props => {
-    return props.style.xPosition + props.style.xPositionUnit;
-  }};
-  top: ${props => {
-    return props.style.yPosition + props.style.yPositionUnit;
-  }};
-`;
+import PositionContainer from "./PositionContainer";
 
 class IconComponent extends React.Component<IIconComponentProps> {
   render() {
     return (
-      <IconContainer {...this.props}>
+      <PositionContainer {...this.props}>
         <Icon icon={this.props.icon} iconSize={this.props.iconSize} />
-      </IconContainer>
+      </PositionContainer>
     );
   }
 }
diff --git a/app/client/src/editorComponents/InputTextComponent.tsx b/app/client/src/editorComponents/InputTextComponent.tsx
index c8855ccccd..38b235578a 100644
--- a/app/client/src/editorComponents/InputTextComponent.tsx
+++ b/app/client/src/editorComponents/InputTextComponent.tsx
@@ -1,22 +1,11 @@
 import * as React from "react";
 import { IComponentProps } from "./BaseComponent";
-import styled from "../constants/DefaultTheme";
-
-const InputTextContainer = styled("span")<IInputTextComponentProps>`
-  color: ${props => props.theme.primaryColor};
-  position: ${props => props.style.positionType};
-  left: ${props => {
-    return props.style.xPosition + props.style.xPositionUnit;
-  }};
-  top: ${props => {
-    return props.style.yPosition + props.style.yPositionUnit;
-  }};
-`;
+import PositionContainer from "./PositionContainer";
 
 class InputTextComponent extends React.Component<IInputTextComponentProps> {
   render() {
     return (
-      <InputTextContainer {...this.props}>
+      <PositionContainer {...this.props}>
         <input
           placeholder={this.props.placeholder}
           type={this.props.type}
@@ -26,7 +15,7 @@ class InputTextComponent extends React.Component<IInputTextComponentProps> {
           maxLength={this.props.maxLength}
           size={this.props.size}
         />
-      </InputTextContainer>
+      </PositionContainer>
     );
   }
 }
diff --git a/app/client/src/editorComponents/PositionContainer.tsx b/app/client/src/editorComponents/PositionContainer.tsx
new file mode 100644
index 0000000000..8a3ea67aac
--- /dev/null
+++ b/app/client/src/editorComponents/PositionContainer.tsx
@@ -0,0 +1,15 @@
+import { IComponentProps } from "./BaseComponent";
+import styled from "../constants/DefaultTheme";
+
+const PositionContainer = styled("div")<IComponentProps>`
+  color: ${props => props.theme.primaryColor};
+  position: ${props => props.style.positionType};
+  left: ${props => {
+    return props.style.xPosition + props.style.xPositionUnit;
+  }};
+  top: ${props => {
+    return props.style.yPosition + props.style.yPositionUnit;
+  }};
+`;
+
+export default PositionContainer;
diff --git a/app/client/src/editorComponents/SpinnerComponent.tsx b/app/client/src/editorComponents/SpinnerComponent.tsx
index 371d448500..dddde8a04d 100644
--- a/app/client/src/editorComponents/SpinnerComponent.tsx
+++ b/app/client/src/editorComponents/SpinnerComponent.tsx
@@ -1,29 +1,18 @@
 import * as React from "react";
 import { IComponentProps } from "./BaseComponent";
+import PositionContainer from "./PositionContainer";
 import { Spinner, Intent } from "@blueprintjs/core";
-import styled from "../constants/DefaultTheme";
-
-const SpinnerContainer = styled("span")<ISpinnerComponentProps>`
-  color: ${props => props.theme.primaryColor};
-  position: ${props => props.style.positionType};
-  left: ${props => {
-    return props.style.xPosition + props.style.xPositionUnit;
-  }};
-  top: ${props => {
-    return props.style.yPosition + props.style.yPositionUnit;
-  }};
-`;
 
 class SpinnerComponent extends React.Component<ISpinnerComponentProps> {
   render() {
     return (
-      <SpinnerContainer {...this.props}>
+      <PositionContainer {...this.props}>
         <Spinner
           size={this.props.size}
           value={this.props.value}
           intent={this.props.intent}
         />
-      </SpinnerContainer>
+      </PositionContainer>
     );
   }
 }
diff --git a/app/client/src/editorComponents/TextComponent.tsx b/app/client/src/editorComponents/TextComponent.tsx
index cb98be5e92..f9106886a3 100644
--- a/app/client/src/editorComponents/TextComponent.tsx
+++ b/app/client/src/editorComponents/TextComponent.tsx
@@ -1,21 +1,10 @@
 import * as React from "react"
 import { IComponentProps } from "./BaseComponent"
-import styled from "../constants/DefaultTheme"
-
-const TextContainer = styled("span")<ITextComponentProps>`
-  color: ${props => props.theme.primaryColor};
-  position: ${props => props.style.positionType};
-  left: ${props => {
-    return props.style.xPosition + props.style.xPositionUnit
-  }};
-  top: ${props => {
-    return props.style.yPosition + props.style.yPositionUnit
-  }};
-`
+import PositionContainer from "./PositionContainer";
 
 class TextComponent extends React.Component<ITextComponentProps> {
   render() {
-    return <TextContainer {...this.props}>{this.props.text}</TextContainer>
+    return <PositionContainer {...this.props}>{this.props.text}</PositionContainer>
   }
 }