Design update

Major update to the design