SW Changes

Split up each section into rows,

Added Macro buttons