diff --git a/src/pages/Cluster/WellOperationsTable.jsx b/src/pages/Cluster/WellOperationsTable.jsx
index 1d2b094..1e8ee65 100755
--- a/src/pages/Cluster/WellOperationsTable.jsx
+++ b/src/pages/Cluster/WellOperationsTable.jsx
@@ -1,7 +1,6 @@
 import { memo, useMemo } from 'react'
-import { Table } from 'antd'
 
-import { makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
+import { Table, makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
 import { getPrecision } from '@utils/functions'
 
 const columns = [
diff --git a/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 426ed21..52931a4 100644
--- a/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -1,12 +1,12 @@
 import { Link, useLocation } from 'react-router-dom'
 import { useState, useEffect, memo, useMemo, lazy, Suspense } from 'react'
 import { LineChartOutlined, ProfileOutlined, TeamOutlined } from '@ant-design/icons'
-import { Table, Button, Badge, Divider, Modal, Row, Col } from 'antd'
+import { Button, Badge, Divider, Modal, Row, Col } from 'antd'
 
 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@components/Table'
+import { Table, makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@components/Table'
 import { WellCompositeService } from '@api'
 import {
   hasPermission,
diff --git a/src/pages/Well/Reports/DailyReport/ReportEditor.jsx b/src/pages/Well/Reports/DailyReport/ReportEditor.jsx
index e77fc61..05c171a 100644
--- a/src/pages/Well/Reports/DailyReport/ReportEditor.jsx
+++ b/src/pages/Well/Reports/DailyReport/ReportEditor.jsx
@@ -1,15 +1,15 @@
-import { DatePicker, Descriptions, Form, Input, InputNumber, Modal, Table, Tabs } from 'antd'
+import { DatePicker, Descriptions, Form, Input, InputNumber, Modal, Table as RawTable, Tabs } from 'antd'
 import { memo, useCallback, useEffect, useState } from 'react'
 import moment from 'moment'
 
 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { makeColumn, makeGroupColumn } from '@components/Table'
+import { Table, makeColumn, makeGroupColumn } from '@components/Table'
 import { DailyReportService } from '@api'
 
 const { Item: RawItem } = Form
-const { Summary } = Table
+const { Summary } = RawTable
 const { TabPane } = Tabs
 
 const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style }} {...other} />)
diff --git a/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index 910aac7..dbe5af1 100644
--- a/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -1,7 +1,7 @@
-import { Table } from 'antd'
 import { useState, useEffect, useCallback, memo, useMemo } from 'react'
 
 import { useWell } from '@asb/context'
+import { Table } from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { Subscribe } from '@services/signalr'
@@ -22,7 +22,7 @@ export const ActiveMessagesOnline = memo(({ well: givenWell }) => {
     if (messages)
     setMessages(messages.items.splice(0, 4))
   }, [])
-  
+
   const columns = useMemo(() => makeMessageColumns(well.id), [well.id])
 
   useEffect(() => {
diff --git a/src/pages/Well/WellCase/index.jsx b/src/pages/Well/WellCase/index.jsx
index 3912da6..1eb9709 100644
--- a/src/pages/Well/WellCase/index.jsx
+++ b/src/pages/Well/WellCase/index.jsx
@@ -1,5 +1,5 @@
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
-import { Alert, Button, Typography } from 'antd'
+import { Alert, Button } from 'antd'
 
 import { useWell } from '@asb/context'
 import { UserView } from '@components/views'