Merge "Fix various UX bugs." into nyc-dev