Removes hard coded button time
Merge branch 'fix/timer-buttons' into develop

* fix/timer-buttons:
  Removes hard coded button time