diff --git a/frontend/src/metabase/admin/datamodel/components/database/MetadataTable.jsx b/frontend/src/metabase/admin/datamodel/components/database/MetadataTable.jsx
index 4419983652715d157d4b9406bb2a6e3af633f852..7b7b5bc709d80b631b52fae109e26e9b8579727a 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/MetadataTable.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/MetadataTable.jsx
@@ -101,7 +101,7 @@ export default class MetadataTable extends Component {
     }
 
     return (
-      <div className="MetadataTable px3 flex-full">
+      <div className="MetadataTable px3">
         <div className="MetadataTable-title flex flex-column bordered rounded">
           <Input
             className="AdminInput TableEditor-table-name text-bold border-bottom rounded-top"
diff --git a/frontend/src/metabase/admin/settings/components/SettingHeader.jsx b/frontend/src/metabase/admin/settings/components/SettingHeader.jsx
index ac5b0d2b3f9211788faaf77d5924864987760e0a..40f71a1539df000300733df8486bc4e1ad5d3e7d 100644
--- a/frontend/src/metabase/admin/settings/components/SettingHeader.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingHeader.jsx
@@ -5,7 +5,7 @@ const SettingHeader = ({ setting }) => (
     <div className="text-grey-4 text-bold text-uppercase">
       {setting.display_name}
     </div>
-    <div className="text-grey-4 my1">
+    <div className="text-grey-4 text-measure my1">
       {setting.description}
       {setting.note && <div>{setting.note}</div>}
     </div>
diff --git a/frontend/src/metabase/components/AdminLayout.jsx b/frontend/src/metabase/components/AdminLayout.jsx
index 0dd4f0e199e134f21e054ebaa6cebfafb6eee551..d0e7079aa7171b63bdb6c93550082529e2302157 100644
--- a/frontend/src/metabase/components/AdminLayout.jsx
+++ b/frontend/src/metabase/components/AdminLayout.jsx
@@ -20,7 +20,7 @@ export default class AdminLayout extends Component {
         <AdminHeader ref="header" title={title} />
         <div className="MetadataEditor-main flex flex-row flex-full mt2">
           {sidebar}
-          <div className="px2 flex-full">{children}</div>
+          <div className="px2 full">{children}</div>
         </div>
       </div>
     );
diff --git a/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx b/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
index 2af52b5b925f9d21d94c27bdb291c8b8d6160539..88b61616ad80a51ee038ae8f1afe12e44fb39d2c 100644
--- a/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
+++ b/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
@@ -126,12 +126,12 @@ export class NewQueryOptions extends Component {
 
     return (
       <div className="full-height flex">
-        <div className="wrapper wrapper--trim lg-wrapper--trim xl-wrapper--trim flex-full px4 mt4 mb2 align-center">
+        <div className="wrapper wrapper--trim lg-wrapper--trim xl-wrapper--trim  px4 mt4 mb2 align-center">
           <div
             className="flex align-center justify-center"
             style={{ minHeight: "100%" }}
           >
-            <ol className="flex-full Grid Grid--guttersXl Grid--full sm-Grid--normal">
+            <ol className="Grid Grid--guttersXl Grid--full sm-Grid--normal">
               {showMetricOption && (
                 <li className="Grid-cell">
                   <NewQueryOption