diff --git a/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalFilter.js b/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalFilter.js
index c1abbad064..77b5224b02 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalFilter.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalFilter.js
@@ -46,7 +46,7 @@ const GlobalFilter = ({ useTableProps }) => {
    */
   const { setGlobalFilter, state: { globalFilter } } = useTableProps
 
-  const [value, setValue] = React.useState(globalFilter)
+  const [value, setValue] = React.useState(() => globalFilter)
 
   const handleChange = React.useCallback(
     // Set undefined to remove the filter entirely
diff --git a/src/fireedge/src/client/components/Tables/Enhanced/styles.js b/src/fireedge/src/client/components/Tables/Enhanced/styles.js
index af685c6a2c..3401db13bd 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/styles.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/styles.js
@@ -45,6 +45,7 @@ export default makeStyles(
       gap: '1em',
       gridTemplateColumns: 'minmax(0, 1fr)',
       gridAutoRows: 'max-content',
+      paddingBlock: '0.8em',
       '& > [role=row]': {
         padding: '0.8em',
         cursor: 'pointer',
diff --git a/src/fireedge/src/client/components/Tables/Marketplaces/index.js b/src/fireedge/src/client/components/Tables/Marketplaces/index.js
index a49e90b28f..2f4e1d1e62 100644
--- a/src/fireedge/src/client/components/Tables/Marketplaces/index.js
+++ b/src/fireedge/src/client/components/Tables/Marketplaces/index.js
@@ -15,7 +15,7 @@ const MarketplacesTable = () => {
   const { getMarketplaces } = useMarketplaceApi()
   const { filterPool } = useAuth()
 
-  const { fetchRequest, loading, reloading, STATUS } = useFetch(getMarketplaces)
+  const { status, fetchRequest, loading, reloading, STATUS } = useFetch(getMarketplaces)
   const { INIT, PENDING } = STATUS
 
   useEffect(() => { fetchRequest() }, [filterPool])
diff --git a/src/fireedge/src/client/containers/Clusters/index.js b/src/fireedge/src/client/containers/Clusters/index.js
index e69a759c49..a1b4e9305c 100644
--- a/src/fireedge/src/client/containers/Clusters/index.js
+++ b/src/fireedge/src/client/containers/Clusters/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Clusters () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.ClustersTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.ClustersTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Datastores/index.js b/src/fireedge/src/client/containers/Datastores/index.js
index 2fea353c61..c92599dbc8 100644
--- a/src/fireedge/src/client/containers/Datastores/index.js
+++ b/src/fireedge/src/client/containers/Datastores/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Datastores () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.DatastoresTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.DatastoresTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Groups/index.js b/src/fireedge/src/client/containers/Groups/index.js
index 42ae22f3fe..15a3305294 100644
--- a/src/fireedge/src/client/containers/Groups/index.js
+++ b/src/fireedge/src/client/containers/Groups/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Groups () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.GroupsTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.GroupsTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Hosts/index.js b/src/fireedge/src/client/containers/Hosts/index.js
index 98fc61415c..8245b9aa9c 100644
--- a/src/fireedge/src/client/containers/Hosts/index.js
+++ b/src/fireedge/src/client/containers/Hosts/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Hosts () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.HostsTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.HostsTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Images/index.js b/src/fireedge/src/client/containers/Images/index.js
index d14a0e5e89..6970d8ef41 100644
--- a/src/fireedge/src/client/containers/Images/index.js
+++ b/src/fireedge/src/client/containers/Images/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Images () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.ImagesTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.ImagesTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/MarketplaceApps/index.js b/src/fireedge/src/client/containers/MarketplaceApps/index.js
index 9253529695..8febf0290f 100644
--- a/src/fireedge/src/client/containers/MarketplaceApps/index.js
+++ b/src/fireedge/src/client/containers/MarketplaceApps/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function MarketplaceApps () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.MarketplaceAppsTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.MarketplaceAppsTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Marketplaces/index.js b/src/fireedge/src/client/containers/Marketplaces/index.js
index 8f007c162e..387e56c278 100644
--- a/src/fireedge/src/client/containers/Marketplaces/index.js
+++ b/src/fireedge/src/client/containers/Marketplaces/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Marketplaces () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.MarketplacesTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.MarketplacesTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/Users/index.js b/src/fireedge/src/client/containers/Users/index.js
index 5c5d476460..c4a2a31ccd 100644
--- a/src/fireedge/src/client/containers/Users/index.js
+++ b/src/fireedge/src/client/containers/Users/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function Users () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.UsersTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.UsersTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/VirtualMachines/index.js b/src/fireedge/src/client/containers/VirtualMachines/index.js
index cfd7f51598..afae5811d7 100644
--- a/src/fireedge/src/client/containers/VirtualMachines/index.js
+++ b/src/fireedge/src/client/containers/VirtualMachines/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function VirtualMachines () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.VmsTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.VmsTable />
+    </Box>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/VmTemplates/index.js b/src/fireedge/src/client/containers/VmTemplates/index.js
index 0ba8cac5c3..0d1c286c5f 100644
--- a/src/fireedge/src/client/containers/VmTemplates/index.js
+++ b/src/fireedge/src/client/containers/VmTemplates/index.js
@@ -1,22 +1,21 @@
 import * as React from 'react'
 
-import { styled, Container as MContainer, Box } from '@material-ui/core'
+import { Container, Box } from '@material-ui/core'
 
 import * as Tables from 'client/components/Tables'
 
-const Container = styled(MContainer)`
-  display: flex;
-  flexDirection: column;
-  height: 100%
-`
-
 function VmTemplates () {
   return (
-    <Container disableGutters>
-      <Box py={2} overflow='auto'>
-        <Tables.VmTemplatesTable />
-      </Box>
-    </Container>
+    <Box
+      height={1}
+      py={2}
+      overflow='auto'
+      display='flex'
+      flexDirection='column'
+      component={Container}
+    >
+      <Tables.VmTemplatesTable />
+    </Box>
   )
 }