diff --git a/src/fireedge/src/client/components/Tables/Hosts/columns.js b/src/fireedge/src/client/components/Tables/Hosts/columns.js
index 213c71cad6..17fbfa4132 100644
--- a/src/fireedge/src/client/components/Tables/Hosts/columns.js
+++ b/src/fireedge/src/client/components/Tables/Hosts/columns.js
@@ -23,8 +23,28 @@ export default [
     filter: 'includesValue'
   },
   { Header: 'Cluster', accessor: 'CLUSTER' },
-  { Header: 'IM MAD', accessor: 'IM_MAD' },
-  { Header: 'VM MAD', accessor: 'VM_MAD' },
+  {
+    Header: 'IM MAD',
+    accessor: 'IM_MAD',
+    disableFilters: false,
+    Filter: ({ column }) => CategoryFilter({
+      column,
+      multiple: true,
+      title: 'IM Mad'
+    }),
+    filter: 'includesValue'
+  },
+  {
+    Header: 'VM MAD',
+    accessor: 'VM_MAD',
+    disableFilters: false,
+    Filter: ({ column }) => CategoryFilter({
+      column,
+      multiple: true,
+      title: 'VM Mad'
+    }),
+    filter: 'includesValue'
+  },
   {
     Header: 'Running VMs',
     id: 'RUNNING_VMS',
diff --git a/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js b/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js
index 3019b50a3e..d0562dbe88 100644
--- a/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js
+++ b/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js
@@ -21,7 +21,14 @@ export default [
   {
     Header: 'Type',
     id: 'TYPE',
-    accessor: row => MarketplaceAppModel.getType(row)
+    accessor: row => MarketplaceAppModel.getType(row),
+    disableFilters: false,
+    Filter: ({ column }) => CategoryFilter({
+      column,
+      multiple: true,
+      title: 'Type'
+    }),
+    filter: 'includesValue'
   },
   { Header: 'Size', accessor: 'SIZE' },
   { Header: 'Registration Time', accessor: 'REGTIME' },
diff --git a/src/fireedge/src/client/containers/Newstone/index.js b/src/fireedge/src/client/containers/Newstone/index.js
index 455a2765b5..b82043ce38 100644
--- a/src/fireedge/src/client/containers/Newstone/index.js
+++ b/src/fireedge/src/client/containers/Newstone/index.js
@@ -43,7 +43,7 @@ const Newstone = () => {
   ), [resource])
 
   return (
-    <Container>
+    <Container maxWidth='xl'>
       {Object.values(TABS).includes(history.location.pathname) && renderTabs}
 
       <Box py={2} overflow='auto'>