Merge "Get rid of negative margins" into nyc-dev