PW-13735  SupplyLogic / Quantum - Template - design updates