Timer UI change
Merge pull request #9 from jpyoung/develop

Timer UI change