Merge "UX cleanups." into nyc-dev