diff --git a/src/web/pages/extras/cvsscalculatorpage.jsx b/src/web/pages/extras/cvsscalculatorpage.jsx
index f206f07422..0fa8732486 100644
--- a/src/web/pages/extras/cvsscalculatorpage.jsx
+++ b/src/web/pages/extras/cvsscalculatorpage.jsx
@@ -681,12 +681,16 @@ const CvssCalculator = props => (
       {/* span prevents Toolbar from growing */}
       <ToolBarIcons />
     </span>
-    <Divider margin="20px" flex="row" align={['center', 'start']} grow>
-      <CvssV2Calculator {...props} />
-      <CvssV3Calculator {...props} />
-    </Divider>
-    <Divider margin="20px" flex="row" align={['center', 'start']} grow>
-      <CvssV4Calculator />
+    <Divider margin="20px" flex="row" align={['flex-start', 'start']} grow wrap>
+      <Layout flex="1" grow>
+        <CvssV2Calculator {...props} />
+      </Layout>
+      <Layout flex="1" grow>
+        <CvssV3Calculator {...props} />
+      </Layout>
+      <Layout flex="1" grow>
+        <CvssV4Calculator />
+      </Layout>
     </Divider>
   </Layout>
 );
diff --git a/src/web/pages/extras/feedstatuspage.jsx b/src/web/pages/extras/feedstatuspage.jsx
index 0be548f5cd..ee26f8d21a 100644
--- a/src/web/pages/extras/feedstatuspage.jsx
+++ b/src/web/pages/extras/feedstatuspage.jsx
@@ -107,10 +107,10 @@ const FeedStatus = ({feeds}) => {
         <Table>
           <TableBody>
             <TableRow>
-              <TableHead width="3rem">{_('Type')}</TableHead>
-              <TableHead width="22rem">{_('Content')}</TableHead>
-              <TableHead width="11rem">{_('Origin')}</TableHead>
-              <TableHead width="7rem">{_('Version')}</TableHead>
+              <TableHead>{_('Type')}</TableHead>
+              <TableHead>{_('Content')}</TableHead>
+              <TableHead>{_('Origin')}</TableHead>
+              <TableHead>{_('Version')}</TableHead>
               <TableHead>{_('Status')}</TableHead>
             </TableRow>