Little fixes
This looks much better
Simplify
Add delay after button detect