Developer agrees to reduce size of controversial Marin City