test design
more design tweaks
Merge pull request #1 from bechatman/design

Update the design