Fix bug - reset timer on button press
Reduce flickering