Add user-settable timeout
Remove 5-second one-click start

We can use the user time now.
Merge commit 'buttons/master'