Merge request that combines Patrick and Junichi's edits to the superchic interface. Tagging @spagan @adimitri @jtanaka @gtateno @ewelina