diff --git a/frontend/src/metabase/lib/formatting/date.js b/frontend/src/metabase/lib/formatting/date.js
index 234e3544e5947b875ae0f48a869f36806361605e..cce023e95eb805f78fe1b07ed2714533d38bd59a 100644
--- a/frontend/src/metabase/lib/formatting/date.js
+++ b/frontend/src/metabase/lib/formatting/date.js
@@ -3,8 +3,8 @@
 import type { DatetimeUnit } from "metabase/meta/types/Query";
 
 export type DateStyle =
-  | "M/D/YY"
-  | "D/M/YY"
+  | "M/D/YYYY"
+  | "D/M/YYYY"
   | "YYYY/M/D"
   | "MMMM D, YYYY"
   | "MMMM D, YYYY"
@@ -36,11 +36,11 @@ const DEFAULT_DATE_FORMATS: { [unit: DatetimeUnit]: MomentFormat } = {
 const DATE_STYLE_TO_FORMAT: {
   [style: DateStyle]: { [unit: DatetimeUnit]: MomentFormat },
 } = {
-  "M/D/YY": {
-    month: "M/YY",
+  "M/D/YYYY": {
+    month: "M/YYYY",
   },
-  "D/M/YY": {
-    month: "M/YY",
+  "D/M/YYYY": {
+    month: "M/YYYY",
   },
   "YYYY/M/D": {
     month: "YYYY/M",
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.js b/frontend/src/metabase/visualizations/lib/settings/column.js
index 7ee0cec35ae3088f97ec2500666827f8a2cf6ea8..d6d56ce848857b0bce564dac5fc7b4c54c0c0512 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.js
+++ b/frontend/src/metabase/visualizations/lib/settings/column.js
@@ -59,12 +59,12 @@ const EXAMPLE_DATE = moment("2018-01-07 17:24");
 
 function getDateStyleOptionsForUnit(unit: ?DatetimeUnit) {
   const options = [
-    dateStyleOption("M/D/YY", unit, hasDay(unit) ? "month, day, year" : null),
-    dateStyleOption("D/M/YY", unit, hasDay(unit) ? "day, month, year" : null),
-    dateStyleOption("YYYY/M/D", unit, hasDay(unit) ? "year, month, day" : null),
     dateStyleOption("MMMM D, YYYY", unit),
     dateStyleOption("D MMMM, YYYY", unit),
     dateStyleOption("dddd, MMMM D, YYYY", unit),
+    dateStyleOption("M/D/YYYY", unit, hasDay(unit) ? "month, day, year" : null),
+    dateStyleOption("D/M/YYYY", unit, hasDay(unit) ? "day, month, year" : null),
+    dateStyleOption("YYYY/M/D", unit, hasDay(unit) ? "year, month, day" : null),
   ];
   const seen = new Set();
   return options.filter(option => {
diff --git a/frontend/src/metabase/visualizations/lib/settings/nested.js b/frontend/src/metabase/visualizations/lib/settings/nested.js
index 73c9e5360d5fe0d8de4b122b917e0683f32f0bad..c28403e9af2f02eaae94428048749d8e283de059 100644
--- a/frontend/src/metabase/visualizations/lib/settings/nested.js
+++ b/frontend/src/metabase/visualizations/lib/settings/nested.js
@@ -112,7 +112,7 @@ export function nestedSettings(
       onChangeSettings,
       extra,
     );
-    return widgets;
+    return widgets.map(widget => ({ ...widget, noPadding: true }));
   }
 
   // decorate with nested settings HOC
diff --git a/frontend/test/visualizations/lib/settings.unit.spec.js b/frontend/test/visualizations/lib/settings.unit.spec.js
index d8fef8b144ac4b39b2b4d0578877968bc7a10db5..497d83390de1a43387425007721b28651a3b9036 100644
--- a/frontend/test/visualizations/lib/settings.unit.spec.js
+++ b/frontend/test/visualizations/lib/settings.unit.spec.js
@@ -9,13 +9,13 @@ describe("visualization_settings", () => {
   describe("getSettings", () => {
     describe("stackable.stack_type", () => {
       it("should default to unstacked stacked", () => {
-        const settings = getSettings(
+        const settings = getComputedSettingsForSeries(
           cardWithTimeseriesBreakout({ unit: "month" }),
         );
         expect(settings["stackable.stack_type"]).toBe(null);
       });
       it("should default area chart to stacked for 1 dimensions and 2 metrics", () => {
-        const settings = getSettings(
+        const settings = getComputedSettingsForSeries(
           cardWithTimeseriesBreakoutAndTwoMetrics({
             display: "area",
             unit: "month",
@@ -42,14 +42,18 @@ describe("visualization_settings", () => {
       describe("non-histgram units", () =>
         NON_HISTOGRAM_UNITS.map(unit =>
           it(`should default ${unit} to false`, () => {
-            const settings = getSettings(cardWithTimeseriesBreakout({ unit }));
+            const settings = getComputedSettingsForSeries(
+              cardWithTimeseriesBreakout({ unit }),
+            );
             expect(settings["graph.x_axis._is_histogram"]).toBe(false);
           }),
         ));
       describe("histgram units", () =>
         HISTOGRAM_UNITS.map(unit =>
           it(`should default ${unit} to true`, () => {
-            const settings = getSettings(cardWithTimeseriesBreakout({ unit }));
+            const settings = getComputedSettingsForSeries(
+              cardWithTimeseriesBreakout({ unit }),
+            );
             expect(settings["graph.x_axis._is_histogram"]).toBe(true);
           }),
         ));