Design update and polish
Merge pull request #24 from jcreedon/dev

Design update and polish