Continue polishing the design for every scenario.
Merge pull request #27 from CoderDojoSF/design-polish

Design polish