Letterheads pick logo or name — and the bid sheet gets both fixes

If your logo already says who you are, the letterhead shouldn't say it again in text right underneath. Until now it did — which pushed some of you into clearing the Organization Name field just to stop the double-up, leaving the name missing everywhere else it's used.

Now every letterhead picks one: the logo when you've uploaded one, your Organization Name as text when you haven't — across proposals, invoices, purchase orders, transmittals (print and PDF packet), field work orders, service tickets, and PCOs. Keep Organization Name filled in; documents with a logo won't repeat it, and it still appears where it's information rather than branding (document footers, To/From blocks).

The estimate bid sheet gets two fixes of its own:

• It joins the letterhead treatment. Your logo renders above the project name (or your Organization Name as text) — it used to show our brand when the name field was blank, which was never the right answer on your paper.
• Labor Rate shows what the bid actually used. Before, that line only knew about the estimate-wide Default CBA — price your labor through the per-line CBA pickers and it read "—" even though every labor line carried a negotiated rate. Now it lists the distinct agreement + loaded $/hr combos your base-bid labor lines were priced with (up to three, then "+ n more"), with the estimate default first when one is set. A dash now genuinely means no CBA rate touched the bid.

The ≈hours note under Labor in the cost summary still keys off the estimate-wide default rate only — with mixed per-line rates there's no single honest divisor.

Also in this pass: the estimate builder's bulk-edit bar now orders its fields O/H → Margin → Waste, matching the table's column order.