Merge "Fix squished UI elements" into nyc-dev