Making some design changes.
Merge branch 'master' of https://github.com/Springsteen/Watch1t