updated layout and BOM