BOM updates

BOM and preview updates