Fixed merge conflict
Changed time to be a button
Merge pull request #4 from toftan/master

Merge pull request #2 from McF1st/master
Merge pull request #3 from McF1st/master

Get latest