Design update and polish

Fixes #8 
Fixes #9 
Fixes #11 
Fixes #12