diff --git a/src/client/Containers/Calculation/Sections/index.jsx b/src/client/Containers/Calculation/Sections/index.jsx
index a9b9dd2..30f18d8 100644
--- a/src/client/Containers/Calculation/Sections/index.jsx
+++ b/src/client/Containers/Calculation/Sections/index.jsx
@@ -1,12 +1,11 @@
 import { Tabs } from 'antd';
 import Background from 'client/Elements/Background';
+import Divider from 'client/Elements/Divider';
 import { Box, Flex } from 'client/UIKit/grid';
+import mq from 'client/UIKit/mq';
 import React from 'react';
 import styled from 'styled-components';
 import SectionsList from './list';
-import withTitle from 'client/hocs/withTitle';
-import mq from 'client/UIKit/mq';
-import Divider from 'client/Elements/Divider';
 
 const { TabPane } = Tabs;
 
@@ -18,6 +17,13 @@ const InputWrapper = styled(Box)`
     `}
   margin: 8px 8px;
 `;
+const Title = styled.h5`
+  color: rgba(0, 0, 0, 0.75);
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 1.5;
+  margin: 0 8px 3px 0;
+`;
 
 const Sections = () => (
   <Background flex="3 0 72%">
@@ -41,7 +47,14 @@ const Sections = () => (
                     width={layout && layout.width}
                     size={layout && layout.size}
                   >
-                    {withTitle(title)(Component)(props)}
+                    <Flex
+                      flexDirection={
+                        (layout && layout.flexDirection) || 'column'
+                      }
+                    >
+                      <Title level={5}>{title}</Title>
+                      <Component {...props} />
+                    </Flex>
                   </InputWrapper>
                 );
               }
diff --git a/src/client/hocs/withTitle.jsx b/src/client/hocs/withTitle.jsx
deleted file mode 100644
index fb0b227..0000000
--- a/src/client/hocs/withTitle.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { Flex } from 'client/UIKit/grid';
-
-import styled from 'styled-components';
-
-const Title = styled.h5`
-  color: rgba(0, 0, 0, 0.75);
-  font-weight: 600;
-  font-size: 14px;
-  line-height: 1.5;
-  margin: 0 0 3px 0;
-`;
-
-const withTitle = title => Component => props => (
-  <Flex flexDirection="column">
-    <Title level={5}>{title}</Title>
-    <Component {...props} />
-  </Flex>
-);
-
-export default withTitle;