Some layout changes to make ergonomic. Updated BOM.