New and better U.S. BOM templates

Before Now