small refactors and fixing the clock
Merge pull request #22 from ieundhdyjfawbb/refactor/timer-buttons

small refactors and fixing the clock